summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Kelley <simon@thekelleys.org.uk>2012-02-29 21:37:14 +0000
committerSimon Kelley <simon@thekelleys.org.uk>2012-02-29 21:37:14 +0000
commitc46c7c7584e069a4a4158683c002f08e307d66cc (patch)
treebf12c823d9300b3a00d2f49d7990afac79ffdd1e
parent552af8b988ea80218c60a5b0fb5baccd1c2e1301 (diff)
downloaddnsmasq-c46c7c7584e069a4a4158683c002f08e307d66cc.tar.gz
tweak portable get-cwd trick code to work on GNU-make 3.82v2.60rc3
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index fe8b9d7..30e70a4 100644
--- a/Makefile
+++ b/Makefile
@@ -46,10 +46,10 @@ MAN = man
#################################################################
-# pmake way.
-top != pwd
+# pmake way. (NB no spaces to keep gmake 3.82 happy)
+top!=pwd
# GNU make way.
-top ?= $(shell pwd)
+top?=$(CURDIR)
dbus_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DBUS $(PKG_CONFIG) --cflags dbus-1`
dbus_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DBUS $(PKG_CONFIG) --libs dbus-1`