commit d4c7b68

Michael Forney  ·  2014-01-14 23:54:29 +0000 UTC
parent 76f5ec3 
Move setting of PKG_CONFIG and WAYLAND_SCANNER to Makefile

This way a sane default will be used if none is specified in config.mk
2 files changed,  +3, -2
M Makefile
M config.mk
M Makefile
+3, -0 
 1@@ -2,6 +2,9 @@
 2 
 3 include config.mk
 4 
 5+PKG_CONFIG      ?= pkg-config
 6+WAYLAND_SCANNER ?= wayland-scanner
 7+
 8 VERSION_MAJOR   := 0
 9 VERSION_MINOR   := 0
10 VERSION         := $(VERSION_MAJOR).$(VERSION_MINOR)
M config.mk
+0, -2 
1@@ -7,8 +7,6 @@ PKGCONFIGDIR        = $(LIBDIR)/pkgconfig
2 
3 CC                  = gcc
4 CFLAGS              = -pipe
5-PKG_CONFIG         ?= pkg-config
6-WAYLAND_SCANNER    ?= wayland-scanner
7 
8 ENABLE_DEBUG        = 1
9