1 Return-Path: <ingmar@exherbo.org>
\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 B89924048D8
\r
6 for <notmuch@notmuchmail.org>; Fri, 12 Mar 2010 05:47:48 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-1.628 tagged_above=-999 required=5 tests=[AWL=0.971,
\r
12 BAYES_00=-2.599] autolearn=ham
\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 GyGU39rLr306 for <notmuch@notmuchmail.org>;
\r
16 Fri, 12 Mar 2010 05:47:47 -0800 (PST)
\r
17 Received: from bach.exherbo.org (bach.exherbo.org [78.47.197.147])
\r
18 by olra.theworths.org (Postfix) with ESMTP id 718944048D9
\r
19 for <notmuch@notmuchmail.org>; Fri, 12 Mar 2010 05:47:45 -0800 (PST)
\r
20 Received: from [83.101.72.69] (helo=localhost)
\r
21 by bach.exherbo.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69)
\r
22 (envelope-from <ingmar@exherbo.org>)
\r
23 id 1Nq5DM-0005WT-Lo; Fri, 12 Mar 2010 13:47:44 +0000
\r
24 From: Ingmar Vanhassel <ingmar@exherbo.org>
\r
25 To: notmuch@notmuchmail.org
\r
26 Date: Fri, 12 Mar 2010 14:47:36 +0100
\r
27 Message-Id: <1268401656-12827-4-git-send-email-ingmar@exherbo.org>
\r
28 X-Mailer: git-send-email 1.7.0.2
\r
29 In-Reply-To: <1268347072-2050-1-git-send-email-bgamari.foss@gmail.com>
\r
30 References: <1268347072-2050-1-git-send-email-bgamari.foss@gmail.com>
\r
31 Subject: [notmuch] [PATCH 3/3] Add a --libdir option to ./configure
\r
32 X-BeenThere: notmuch@notmuchmail.org
\r
33 X-Mailman-Version: 2.1.13
\r
35 List-Id: "Use and development of the notmuch mail system."
\r
36 <notmuch.notmuchmail.org>
\r
37 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
38 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
39 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
40 List-Post: <mailto:notmuch@notmuchmail.org>
\r
41 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
42 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
43 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
44 X-List-Received-Date: Fri, 12 Mar 2010 13:47:48 -0000
\r
46 This allows packagers to specify to which directory libraries should be
\r
49 Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org>
\r
51 Makefile.local | 6 +++---
\r
52 configure | 7 +++++++
\r
53 2 files changed, 10 insertions(+), 3 deletions(-)
\r
55 diff --git a/Makefile.local b/Makefile.local
\r
56 index 31ab534..e139395 100644
\r
57 --- a/Makefile.local
\r
58 +++ b/Makefile.local
\r
59 @@ -27,15 +27,15 @@ notmuch.1.gz: notmuch.1
\r
60 $(call quiet,gzip) --stdout $^ > $@
\r
62 install: all notmuch.1.gz
\r
63 - for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/lib/ \
\r
64 + for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(libdir)/ \
\r
65 $(DESTDIR)$(prefix)/include/ $(DESTDIR)$(prefix)/share/man/man1 ; \
\r
69 install notmuch $(DESTDIR)$(prefix)/bin/
\r
70 - install lib/$(SONAME) $(DESTDIR)$(prefix)/lib/
\r
71 + install lib/$(SONAME) $(DESTDIR)$(libdir)/
\r
72 install lib/notmuch.h $(DESTDIR)$(prefix)/include/
\r
73 - ln -sf $(SONAME) $(DESTDIR)$(prefix)/lib/libnotmuch.so
\r
74 + ln -sf $(SONAME) $(DESTDIR)$(libdir)/libnotmuch.so
\r
75 install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
\r
76 ifeq ($(MAKECMDGOALS), install)
\r
78 diff --git a/configure b/configure
\r
79 index a2af672..1caff94 100755
\r
82 @@ -11,6 +11,7 @@ XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config-1.1 xapian-config}
\r
83 # Set the defaults for values the user can specify with command-line
\r
86 +LIBDIR=${PREFIX}/lib
\r
90 @@ -49,6 +50,7 @@ Additionally, various options can be specified on the configure
\r
93 --prefix=PREFIX Install files in PREFIX [$PREFIX]
\r
94 + --libdir=LIBDIR Install libraries in LIBDIR [$LIBDIR]
\r
96 By default, "make install" will install the resulting program to
\r
97 $PREFIX/bin, documentation to $PREFIX/share, etc. You can
\r
98 @@ -67,6 +69,8 @@ for option; do
\r
100 elif [ "${option%%=*}" = '--prefix' ] ; then
\r
101 PREFIX="${option#*=}"
\r
102 + elif [ "${option%%=*}" = '--libdir' ] ; then
\r
103 + LIBDIR="${option#*=}"
\r
105 echo "Unrecognized option: ${option}."
\r
107 @@ -271,6 +275,9 @@ CXXFLAGS = ${CXXFLAGS}
\r
108 # The prefix to which notmuch should be installed
\r
111 +# The directory to which notmuch libraries should be installed
\r
112 +libdir = ${LIBDIR}
\r
114 # The directory to which emacs lisp files should be installed
\r
115 emacs_lispdir=${emacs_lispdir}
\r