configure: Fix installation of library to work with alternate --prefix

[notmuch] / configure

diff --git a/configure b/configure
index d240b6acf8bda20b033e62ef1beda4c3cebe38d3..5d254b3d97c09ab8ee047f4cd0b3719c3258909b 100755 (executable)
--- 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
 # Set the defaults for values the user can specify with command-line
 # options.
 PREFIX=/usr/local

+LIBDIR=

 
 usage ()
 {
 
 usage ()
 {


@@ -51,12 +52,16 @@ command line.
        --prefix=PREFIX Install files in PREFIX [$PREFIX]
 
 By default, "make install" will install the resulting program to
        --prefix=PREFIX Install files in PREFIX [$PREFIX]
 
 By default, "make install" will install the resulting program to

-$PREFIX/bin, documentation to $PREFIX/share, etc. You can
+$PREFIX/bin, documentation to $PREFIX/man, etc. You can

 specify an installation prefix other than $PREFIX using
 --prefix, for instance:
 
        ./configure --prefix=\$HOME
 
 specify an installation prefix other than $PREFIX using
 --prefix, for instance:
 
        ./configure --prefix=\$HOME
 

+Fine tuning of some installation directories is available:
+
+       --libdir=DIR    Install libraries in LIBDIR [PREFIX/lib]
+

 EOF
 }
 
 EOF
 }
 


@@ -67,6 +72,8 @@ for option; do
        exit 0
     elif [ "${option%%=*}" = '--prefix' ] ; then
        PREFIX="${option#*=}"
        exit 0
     elif [ "${option%%=*}" = '--prefix' ] ; then
        PREFIX="${option#*=}"

+    elif [ "${option%%=*}" = '--libdir' ] ; then
+       LIBDIR="${option#*=}"

     else
        echo "Unrecognized option: ${option}."
        echo "See:"
     else
        echo "Unrecognized option: ${option}."
        echo "See:"


@@ -271,9 +278,15 @@ CXXFLAGS = ${CXXFLAGS}
 # The prefix to which notmuch should be installed
 prefix = ${PREFIX}
 
 # The prefix to which notmuch should be installed
 prefix = ${PREFIX}
 

+# The directory to which notmuch libraries should be installed
+libdir = ${LIBDIR:=$PREFIX/lib}
+

 # The directory to which emacs lisp files should be installed
 emacs_lispdir=${emacs_lispdir}
 
 # The directory to which emacs lisp files should be installed
 emacs_lispdir=${emacs_lispdir}
 

+# The directory to which desktop files should be installed
+desktop_dir = \${prefix}/share/applications
+

 # Whether the getline function is available (if not, then notmuch will
 # build its own version)
 HAVE_GETLINE = ${have_getline}
 # Whether the getline function is available (if not, then notmuch will
 # build its own version)
 HAVE_GETLINE = ${have_getline}