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 B3771431FAF
\r
6 for <notmuch@notmuchmail.org>; Wed, 28 Nov 2012 04:26:11 -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 gkqsnph+yOg9 for <notmuch@notmuchmail.org>;
\r
16 Wed, 28 Nov 2012 04:26:11 -0800 (PST)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 46B07431FAE
\r
21 for <notmuch@notmuchmail.org>; Wed, 28 Nov 2012 04:26:11 -0800 (PST)
\r
22 Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([142.167.90.129] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)
\r
26 (envelope-from <bremner@tethera.net>)
\r
27 id 1TdgiQ-0002hi-3X; Wed, 28 Nov 2012 08:26:10 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1TdgiK-00089S-Ks; Wed, 28 Nov 2012 08:26:04 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH] configure: really expand libdir_expanded
\r
34 Date: Wed, 28 Nov 2012 08:25:52 -0400
\r
35 Message-Id: <1354105552-31297-1-git-send-email-david@tethera.net>
\r
36 X-Mailer: git-send-email 1.7.10.4
\r
38 Cc: David Bremner <bremner@debian.org>
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.13
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Wed, 28 Nov 2012 12:26:11 -0000
\r
53 From: David Bremner <bremner@debian.org>
\r
55 It turns out that if people really use configure in autotools style and pass
\r
56 libdir containing '${prefix}/foo' then the ldconfig previously failed.
\r
58 This uses sed for portability (versus bash parameter expansion with
\r
59 substitution) and hopefully a bit more robustness than blindly
\r
60 parameter expanding the string.
\r
62 configure | 7 ++++++-
\r
63 1 file changed, 6 insertions(+), 1 deletion(-)
\r
65 diff --git a/configure b/configure
\r
66 index ea8a1ad..460fcfc 100755
\r
69 @@ -236,7 +236,12 @@ done
\r
70 # Makefile.config file later like most values), because we need to
\r
71 # actually investigate this value compared to the ldconfig_paths value
\r
73 -libdir_expanded=${LIBDIR:-${PREFIX}/lib}
\r
74 +if [ -z "$LIBDIR" ] ; then
\r
75 + libdir_expanded="${PREFIX}/lib"
\r
77 + # very non-general variable expansion
\r
78 + libdir_expanded=`echo "$LIBDIR" | sed "s|\\${prefix}|${PREFIX}|g; s|\\$prefix/|${PREFIX}/|; s|//*|/|g"`
\r
82 Welcome to Notmuch, a system for indexing, searching and tagging your email.
\r