1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id D555C431FBD
\r
6 for <notmuch@notmuchmail.org>; Sat, 8 Mar 2014 06:00:52 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id T1abC5nHVEg6 for <notmuch@notmuchmail.org>;
\r
16 Sat, 8 Mar 2014 06:00:48 -0800 (PST)
\r
17 Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])
\r
18 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 2381A431FB6
\r
21 for <notmuch@notmuchmail.org>; Sat, 8 Mar 2014 06:00:48 -0800 (PST)
\r
22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
\r
23 (envelope-from <bremner@tethera.net>)
\r
24 id 1WMHnx-0003Vi-Mb; Sat, 08 Mar 2014 10:00:45 -0400
\r
25 Received: (nullmailer pid 17893 invoked by uid 1000); Sat, 08 Mar 2014
\r
27 From: David Bremner <david@tethera.net>
\r
28 To: notmuch@notmuchmail.org
\r
29 Subject: [PATCH] test: don't use $(dir) in recipes.
\r
30 Date: Sat, 8 Mar 2014 10:00:39 -0400
\r
31 Message-Id: <1394287239-17850-1-git-send-email-david@tethera.net>
\r
32 X-Mailer: git-send-email 1.8.5.3
\r
33 X-BeenThere: notmuch@notmuchmail.org
\r
34 X-Mailman-Version: 2.1.13
\r
36 List-Id: "Use and development of the notmuch mail system."
\r
37 <notmuch.notmuchmail.org>
\r
38 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
39 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
40 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
41 List-Post: <mailto:notmuch@notmuchmail.org>
\r
42 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
43 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
44 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
45 X-List-Received-Date: Sat, 08 Mar 2014 14:00:53 -0000
\r
47 According the semantics of make, the expansion of $(dir) in recipes
\r
48 uses dynamic scope, i.e. the value at the time the recipe is run. This
\r
49 means if test/Makefile.local is not the last sub-makefile included,
\r
50 all heck breaks loose.
\r
53 This was originally part of some suggested changes to Jani's folder
\r
54 series, but no reason to wait for Jani and I to sort that out.
\r
56 test/Makefile.local | 4 +++-
\r
57 1 file changed, 3 insertions(+), 1 deletion(-)
\r
59 diff --git a/test/Makefile.local b/test/Makefile.local
\r
60 index 99324ba..36b1c1b 100644
\r
61 --- a/test/Makefile.local
\r
62 +++ b/test/Makefile.local
\r
67 +# save against changes in $(dir)
\r
68 +test_src_dir := $(dir)
\r
72 @@ -45,7 +47,7 @@ TEST_BINARIES=$(dir)/arg-test \
\r
73 test-binaries: $(TEST_BINARIES)
\r
75 test: all test-binaries
\r
76 - @${dir}/notmuch-test $(OPTIONS)
\r
77 + @${test_src_dir}/notmuch-test $(OPTIONS)
\r