mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-25 04:18:08 +01:00
configure: calculate NOTMUCH_BUILDDIR, write to Makefile.config
This will correct the current use of an undefined variable when setting LD_LIBRARY_PATH in doc/Makefile.local It is tempting to try to replace the use of test/export-dirs.sh, but this is not as simple as it looks, as NOTMUCH_BUILDDIR is used to locate sh.config, so probably cannot also sensibly be used to define it.
This commit is contained in:
parent
25e0f5e592
commit
14c4f9441d
1 changed files with 5 additions and 0 deletions
5
configure
vendored
5
configure
vendored
|
@ -55,6 +55,8 @@ subdirs="${subdirs} bindings"
|
|||
# the directory structure and copy Makefiles.
|
||||
if [ "$srcdir" != "." ]; then
|
||||
|
||||
NOTMUCH_BUILDDIR=$PWD
|
||||
|
||||
for dir in . ${subdirs}; do
|
||||
mkdir -p "$dir"
|
||||
cp "$srcdir"/"$dir"/Makefile.local "$dir"
|
||||
|
@ -78,6 +80,8 @@ if [ "$srcdir" != "." ]; then
|
|||
"$srcdir"/bindings/python-cffi/notmuch2 \
|
||||
"$srcdir"/bindings/python-cffi/setup.py \
|
||||
bindings/python-cffi/
|
||||
else
|
||||
NOTMUCH_BUILDDIR=$NOTMUCH_SRCDIR
|
||||
fi
|
||||
|
||||
# Set several defaults (optionally specified by the user in
|
||||
|
@ -1245,6 +1249,7 @@ cat > Makefile.config <<EOF
|
|||
# directory (the current directory at the time configure was run).
|
||||
srcdir = ${srcdir}
|
||||
NOTMUCH_SRCDIR = ${NOTMUCH_SRCDIR}
|
||||
NOTMUCH_BUILDDIR = ${NOTMUCH_BUILDDIR}
|
||||
|
||||
# subdirectories to build
|
||||
subdirs = ${subdirs}
|
||||
|
|
Loading…
Reference in a new issue