From: David Bremner <david@tethera.net>
Date: Sat, 8 Mar 2014 14:00:39 +0000 (-0400)
Subject: test: don't use $(dir) in recipes.
X-Git-Tag: 0.18_rc0~115
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b21f0f68029173035de6616b63320b36d5b1d009;p=notmuch.git

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.
---

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