summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngmar Vanhassel <ingmar@exherbo.org>2010-03-12 14:47:36 +0100
committerCarl Worth <cworth@cworth.org>2010-03-31 18:07:58 -0700
commitacaff279e241a2cedb7c07a5dbf3e942fec74aea (patch)
tree4292eae64bf3bae58f27be318857231d5a50cff2
parent07378d0d1485c7cc0b126965dacd4714ebfdaa93 (diff)
Add a --libdir option to ./configure
This allows packagers to specify to which directory libraries should be installed. Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org>
-rw-r--r--Makefile.local6
-rwxr-xr-xconfigure7
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}