commit 27062ef

Michael Forney  ·  2014-01-24 08:00:43 +0000 UTC
parent 6de2d41 
Set default paths and programs in Makefile
2 files changed,  +21, -8
M Makefile
M config.mk
M Makefile
+11, -0 
 1@@ -3,6 +3,17 @@
 2 .PHONY: all
 3 all: build
 4 
 5+# Defaults for config.mk
 6+PREFIX          ?= /usr
 7+BINDIR          ?= $(PREFIX)/bin
 8+LIBDIR          ?= $(PREFIX)/lib
 9+INCLUDEDIR      ?= $(PREFIX)/include
10+DATADIR         ?= $(PREFIX)/share
11+PKGCONFIGDIR    ?= $(LIBDIR)/pkgconfig
12+
13+PKG_CONFIG      ?= pkg-config
14+WAYLAND_SCANNER ?= wayland-scanner
15+
16 VERSION_MAJOR   := 0
17 VERSION_MINOR   := 0
18 VERSION         := $(VERSION_MAJOR).$(VERSION_MINOR)
M config.mk
+10, -8 
 1@@ -1,17 +1,19 @@
 2 # swc: config.mk
 3 
 4-PREFIX          = /usr/local
 5-BINDIR          = $(PREFIX)/bin
 6-LIBDIR          = $(PREFIX)/lib
 7-INCLUDEDIR      = $(PREFIX)/include
 8-DATADIR         = $(PREFIX)/share
 9-PKGCONFIGDIR    = $(LIBDIR)/pkgconfig
10+# The commented out options are defaults
11+
12+# PREFIX          = /usr/local
13+# BINDIR          = $(PREFIX)/bin
14+# LIBDIR          = $(PREFIX)/lib
15+# INCLUDEDIR      = $(PREFIX)/include
16+# DATADIR         = $(PREFIX)/share
17+# PKGCONFIGDIR    = $(LIBDIR)/pkgconfig
18 
19 CC              = gcc
20 CPPFLAGS        = -D_GNU_SOURCE # Required for mkostemp
21 CFLAGS          = -pipe
22-PKG_CONFIG      ?= pkg-config
23-WAYLAND_SCANNER ?= wayland-scanner
24+# PKG_CONFIG      = pkg-config
25+# WAYLAND_SCANNER = wayland-scanner
26 
27 ENABLE_DEBUG        = 1
28