mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-22 09:24:54 +01:00
configure: Fix installation of library to work with alternate --prefix
If an explicit --libdir is passed, then that is used directly. Otherwise libdir is chosen as the value of $PREFIX/lib, (whether or not prefix was passed explicitly or set by default).
This commit is contained in:
parent
2057688645
commit
bf159bd829
1 changed files with 6 additions and 3 deletions
9
configure
vendored
9
configure
vendored
|
@ -11,7 +11,7 @@ XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config-1.1 xapian-config}
|
||||||
# Set the defaults for values the user can specify with command-line
|
# Set the defaults for values the user can specify with command-line
|
||||||
# options.
|
# options.
|
||||||
PREFIX=/usr/local
|
PREFIX=/usr/local
|
||||||
LIBDIR=${PREFIX}/lib
|
LIBDIR=
|
||||||
|
|
||||||
usage ()
|
usage ()
|
||||||
{
|
{
|
||||||
|
@ -50,7 +50,6 @@ Additionally, various options can be specified on the configure
|
||||||
command line.
|
command line.
|
||||||
|
|
||||||
--prefix=PREFIX Install files in PREFIX [$PREFIX]
|
--prefix=PREFIX Install files in PREFIX [$PREFIX]
|
||||||
--libdir=LIBDIR Install libraries in LIBDIR [$LIBDIR]
|
|
||||||
|
|
||||||
By default, "make install" will install the resulting program to
|
By default, "make install" will install the resulting program to
|
||||||
$PREFIX/bin, documentation to $PREFIX/man, etc. You can
|
$PREFIX/bin, documentation to $PREFIX/man, etc. You can
|
||||||
|
@ -59,6 +58,10 @@ specify an installation prefix other than $PREFIX using
|
||||||
|
|
||||||
./configure --prefix=\$HOME
|
./configure --prefix=\$HOME
|
||||||
|
|
||||||
|
Fine tuning of some installation directories is available:
|
||||||
|
|
||||||
|
--libdir=DIR Install libraries in LIBDIR [PREFIX/lib]
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -276,7 +279,7 @@ CXXFLAGS = ${CXXFLAGS}
|
||||||
prefix = ${PREFIX}
|
prefix = ${PREFIX}
|
||||||
|
|
||||||
# The directory to which notmuch libraries should be installed
|
# The directory to which notmuch libraries should be installed
|
||||||
libdir = ${LIBDIR}
|
libdir = ${LIBDIR:=$PREFIX/lib}
|
||||||
|
|
||||||
# The directory to which emacs lisp files should be installed
|
# The directory to which emacs lisp files should be installed
|
||||||
emacs_lispdir=${emacs_lispdir}
|
emacs_lispdir=${emacs_lispdir}
|
||||||
|
|
Loading…
Reference in a new issue