From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id C50CB431FBF for ; Sat, 8 Mar 2014 13:21:45 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bjdbFncxhCuO for ; Sat, 8 Mar 2014 13:21:45 -0800 (PST) Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id D728C431FC4 for ; Sat, 8 Mar 2014 13:20:57 -0800 (PST) Received: from remotemail by yantan.tethera.net with local (Exim 4.80) (envelope-from ) id 1WMOfx-0005AB-FC; Sat, 08 Mar 2014 17:20:57 -0400 Received: (nullmailer pid 28550 invoked by uid 1000); Sat, 08 Mar 2014 21:20:03 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [Patch v3 12/15] test: don't use $(dir) in recipes. Date: Sat, 8 Mar 2014 17:19:42 -0400 Message-Id: <1394313585-28422-13-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1394313585-28422-1-git-send-email-david@tethera.net> References: <1394313585-28422-1-git-send-email-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Mar 2014 21:21:46 -0000 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. --- test/Makefile.local | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/Makefile.local b/test/Makefile.local index 070c84b..40aa7d8 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 -- 1.8.5.3