1 Return-Path: <aidecoe@aidecoe.name>
\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 C2A28431FD0
\r
6 for <notmuch@notmuchmail.org>; Sun, 23 Oct 2011 07:44:48 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\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 MD7nOI2YmJ-C for <notmuch@notmuchmail.org>;
\r
16 Sun, 23 Oct 2011 07:44:48 -0700 (PDT)
\r
17 Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com
\r
18 [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id E7CC0431FB6
\r
21 for <notmuch@notmuchmail.org>; Sun, 23 Oct 2011 07:44:47 -0700 (PDT)
\r
22 Received: by bke11 with SMTP id 11so7677022bke.26
\r
23 for <notmuch@notmuchmail.org>; Sun, 23 Oct 2011 07:44:46 -0700 (PDT)
\r
24 Received: by 10.223.63.130 with SMTP id b2mr38789952fai.35.1319381086268;
\r
25 Sun, 23 Oct 2011 07:44:46 -0700 (PDT)
\r
26 Received: from localhost (abst122.neoplus.adsl.tpnet.pl. [83.8.139.122])
\r
27 by mx.google.com with ESMTPS id 5sm6845665fad.9.2011.10.23.07.44.43
\r
28 (version=TLSv1/SSLv3 cipher=OTHER);
\r
29 Sun, 23 Oct 2011 07:44:44 -0700 (PDT)
\r
30 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
\r
31 To: notmuch@notmuchmail.org
\r
32 Subject: [PATCH] Prefix lib/notmuch.h and lib/gen-version-script.sh with
\r
34 Date: Sun, 23 Oct 2011 16:44:01 +0200
\r
35 Message-Id: <1319381041-15800-1-git-send-email-aidecoe@aidecoe.name>
\r
36 X-Mailer: git-send-email 1.7.7
\r
37 X-Mailman-Approved-At: Mon, 24 Oct 2011 11:32:10 -0700
\r
38 Cc: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
\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: Sun, 23 Oct 2011 14:44:48 -0000
\r
53 lib/notmuch.h and lib/gen-version-script.sh couldn't have been found
\r
54 when building out of sources directory.
\r
56 lib/Makefile.local | 13 +++++++------
\r
57 1 files changed, 7 insertions(+), 6 deletions(-)
\r
59 diff --git a/lib/Makefile.local b/lib/Makefile.local
\r
60 index ea20b2b..be51eaa 100644
\r
61 --- a/lib/Makefile.local
\r
62 +++ b/lib/Makefile.local
\r
63 @@ -41,6 +41,11 @@ endif
\r
65 extra_cflags += -I$(srcdir)/$(dir) -fPIC
\r
67 +# The (often-reused) $dir works fine within targets/prerequisites,
\r
68 +# but cannot be used reliably within commands, so copy its value to a
\r
69 +# variable that is not reused.
\r
72 libnotmuch_c_srcs = \
\r
73 $(notmuch_compat_srcs) \
\r
74 $(dir)/filenames.c \
\r
75 @@ -68,8 +73,8 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)
\r
76 $(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym
\r
77 $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@
\r
79 -notmuch.sym: lib/notmuch.h $(libnotmuch_modules)
\r
80 - sh lib/gen-version-script.sh $< $(libnotmuch_modules) > $@
\r
81 +notmuch.sym: $(srcdir)/$(dir)/notmuch.h $(libnotmuch_modules)
\r
82 + sh $(srcdir)/$(lib)/gen-version-script.sh $< $(libnotmuch_modules) > $@
\r
84 $(dir)/$(SONAME): $(dir)/$(LIBNAME)
\r
85 ln -sf $(LIBNAME) $@
\r
86 @@ -79,10 +84,6 @@ $(dir)/$(LINKER_NAME): $(dir)/$(SONAME)
\r
88 install: install-$(dir)
\r
90 -# The (often-reused) $dir works fine within targets/prerequisites,
\r
91 -# but cannot be used reliably within commands, so copy its value to a
\r
92 -# variable that is not reused.
\r
94 install-$(dir): $(dir)/$(LIBNAME)
\r
95 mkdir -p "$(DESTDIR)$(libdir)/"
\r
96 install -m0644 "$(lib)/$(LIBNAME)" "$(DESTDIR)$(libdir)/"
\r