Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id B89924048D8 for ; Fri, 12 Mar 2010 05:47:48 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -1.628 X-Spam-Level: X-Spam-Status: No, score=-1.628 tagged_above=-999 required=5 tests=[AWL=0.971, BAYES_00=-2.599] autolearn=ham Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GyGU39rLr306 for ; Fri, 12 Mar 2010 05:47:47 -0800 (PST) Received: from bach.exherbo.org (bach.exherbo.org [78.47.197.147]) by olra.theworths.org (Postfix) with ESMTP id 718944048D9 for ; Fri, 12 Mar 2010 05:47:45 -0800 (PST) Received: from [83.101.72.69] (helo=localhost) by bach.exherbo.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1Nq5DM-0005WT-Lo; Fri, 12 Mar 2010 13:47:44 +0000 From: Ingmar Vanhassel To: notmuch@notmuchmail.org Date: Fri, 12 Mar 2010 14:47:36 +0100 Message-Id: <1268401656-12827-4-git-send-email-ingmar@exherbo.org> X-Mailer: git-send-email 1.7.0.2 In-Reply-To: <1268347072-2050-1-git-send-email-bgamari.foss@gmail.com> References: <1268347072-2050-1-git-send-email-bgamari.foss@gmail.com> Subject: [notmuch] [PATCH 3/3] Add a --libdir option to ./configure X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Mar 2010 13:47:48 -0000 This allows packagers to specify to which directory libraries should be installed. Signed-off-by: Ingmar Vanhassel --- Makefile.local | 6 +++--- configure | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile.local b/Makefile.local index 31ab534..e139395 100644 --- a/Makefile.local +++ b/Makefile.local @@ -27,15 +27,15 @@ notmuch.1.gz: notmuch.1 $(call quiet,gzip) --stdout $^ > $@ install: all notmuch.1.gz - for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/lib/ \ + for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(libdir)/ \ $(DESTDIR)$(prefix)/include/ $(DESTDIR)$(prefix)/share/man/man1 ; \ do \ install -d $$d ; \ done ; install notmuch $(DESTDIR)$(prefix)/bin/ - install lib/$(SONAME) $(DESTDIR)$(prefix)/lib/ + install lib/$(SONAME) $(DESTDIR)$(libdir)/ install lib/notmuch.h $(DESTDIR)$(prefix)/include/ - ln -sf $(SONAME) $(DESTDIR)$(prefix)/lib/libnotmuch.so + ln -sf $(SONAME) $(DESTDIR)$(libdir)/libnotmuch.so install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ ifeq ($(MAKECMDGOALS), install) @echo "" diff --git a/configure b/configure index a2af672..1caff94 100755 --- a/configure +++ b/configure @@ -11,6 +11,7 @@ XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config-1.1 xapian-config} # Set the defaults for values the user can specify with command-line # options. PREFIX=/usr/local +LIBDIR=${PREFIX}/lib usage () { @@ -49,6 +50,7 @@ Additionally, various options can be specified on the configure command line. --prefix=PREFIX Install files in PREFIX [$PREFIX] + --libdir=LIBDIR Install libraries in LIBDIR [$LIBDIR] By default, "make install" will install the resulting program to $PREFIX/bin, documentation to $PREFIX/share, etc. You can @@ -67,6 +69,8 @@ for option; do exit 0 elif [ "${option%%=*}" = '--prefix' ] ; then PREFIX="${option#*=}" + elif [ "${option%%=*}" = '--libdir' ] ; then + LIBDIR="${option#*=}" else echo "Unrecognized option: ${option}." echo "See:" @@ -271,6 +275,9 @@ CXXFLAGS = ${CXXFLAGS} # The prefix to which notmuch should be installed prefix = ${PREFIX} +# The directory to which notmuch libraries should be installed +libdir = ${LIBDIR} + # The directory to which emacs lisp files should be installed emacs_lispdir=${emacs_lispdir} -- 1.7.0.2