aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar David Bremner <david@tethera.net>2014-03-08 10:00:39 -0400
committerGravatar David Bremner <david@tethera.net>2014-03-09 10:02:57 -0300
commitb21f0f68029173035de6616b63320b36d5b1d009 (patch)
treefcc43b67235cf62541efaab6aac4164e925bc4f2
parent268a33f4c2c0eefc06b2130f6aa77643f7d5995a (diff)
test: don't use $(dir) in recipes.
According the semantics of make, the expansion of $(dir) in recipes uses dynamic scope, i.e. the value at the time the recipe is run. This means if test/Makefile.local is not the last sub-makefile included, all heck breaks loose.
-rw-r--r--test/Makefile.local4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/Makefile.local b/test/Makefile.local
index 99324ba1..36b1c1b7 100644
--- a/test/Makefile.local
+++ b/test/Makefile.local
@@ -2,6 +2,8 @@
dir := test
+# save against changes in $(dir)
+test_src_dir := $(dir)
extra_cflags += -I.
smtp_dummy_srcs = \
@@ -45,7 +47,7 @@ TEST_BINARIES=$(dir)/arg-test \
test-binaries: $(TEST_BINARIES)
test: all test-binaries
- @${dir}/notmuch-test $(OPTIONS)
+ @${test_src_dir}/notmuch-test $(OPTIONS)
check: test