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 119B1431FD7
\r
6 for <notmuch@notmuchmail.org>; Wed, 19 Mar 2014 17:48:29 -0700 (PDT)
\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 CDiBlDTFKDzg for <notmuch@notmuchmail.org>;
\r
16 Wed, 19 Mar 2014 17:48:24 -0700 (PDT)
\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 C746D431FBF
\r
21 for <notmuch@notmuchmail.org>; Wed, 19 Mar 2014 17:48:22 -0700 (PDT)
\r
22 Received: from remotemail by yantan.tethera.net with local (Exim 4.80)
\r
23 (envelope-from <bremner@tethera.net>)
\r
24 id 1WQR9i-0000Hj-FV; Wed, 19 Mar 2014 21:48:22 -0300
\r
25 Received: (nullmailer pid 22551 invoked by uid 1000); Thu, 20 Mar 2014
\r
27 From: David Bremner <david@tethera.net>
\r
28 To: notmuch@notmuchmail.org
\r
29 Subject: [PATCH 1/3] build: compute subdirectories from the presence of
\r
31 Date: Wed, 19 Mar 2014 21:48:02 -0300
\r
32 Message-Id: <1395276484-22363-2-git-send-email-david@tethera.net>
\r
33 X-Mailer: git-send-email 1.9.0
\r
34 In-Reply-To: <1395276484-22363-1-git-send-email-david@tethera.net>
\r
35 References: <1395276484-22363-1-git-send-email-david@tethera.net>
\r
36 X-BeenThere: notmuch@notmuchmail.org
\r
37 X-Mailman-Version: 2.1.13
\r
39 List-Id: "Use and development of the notmuch mail system."
\r
40 <notmuch.notmuchmail.org>
\r
41 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
42 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
43 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
44 List-Post: <mailto:notmuch@notmuchmail.org>
\r
45 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
46 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
48 X-List-Received-Date: Thu, 20 Mar 2014 00:48:29 -0000
\r
50 This allows the fragile sed command in configure to be replaced with a somewhat
\r
51 less fragile find command.
\r
55 2 files changed, 2 insertions(+), 3 deletions(-)
\r
57 diff --git a/Makefile b/Makefile
\r
58 index 061c55a..74b476c 100644
\r
61 @@ -5,8 +5,7 @@ all:
\r
62 # List all subdirectories here. Each contains its own Makefile.local.
\r
63 # Use of '=', without '+=', seems to be required for out-of-tree
\r
65 -subdirs = compat completion doc emacs lib parse-time-string \
\r
66 - performance-test util test test/test-databases
\r
67 +subdirs = $(dir $(shell find . -mindepth 2 -name Makefile.local))
\r
69 # We make all targets depend on the Makefiles themselves.
\r
70 global_deps = Makefile Makefile.config Makefile.local \
\r
71 diff --git a/configure b/configure
\r
72 index fb276f1..b3b1b44 100755
\r
75 @@ -23,7 +23,7 @@ srcdir=$(dirname "$0")
\r
76 # the directory structure and copy Makefiles.
\r
77 if [ "$srcdir" != "." ]; then
\r
79 - for dir in . $(grep "^subdirs *=" "$srcdir"/Makefile | sed -e "s/subdirs *= *//"); do
\r
80 + for dir in $(cd $srcdir && find . -name Makefile.local -exec dirname {} \;); do
\r
82 cp "$srcdir"/"$dir"/Makefile.local "$dir"
\r
83 cp "$srcdir"/"$dir"/Makefile "$dir"
\r