debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-03-29 10:48:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure: calculate NOTMUCH_BUILDDIR, write to Makefile.config

Browse source 
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:
David Bremner 2021-12-22 21:44:45 -04:00
parent 25e0f5e592
commit 14c4f9441d
1 changed files with 5 additions and 0 deletions

5
configure vendored
View file

@ -55,6 +55,8 @@ subdirs="${subdirs} bindings"
# the directory structure and copy Makefiles. # the directory structure and copy Makefiles.
if [ "$srcdir" != "." ]; then if [ "$srcdir" != "." ]; then
NOTMUCH_BUILDDIR=$PWD
for dir in . ${subdirs}; do for dir in . ${subdirs}; do
mkdir -p "$dir" mkdir -p "$dir"
cp "$srcdir"/"$dir"/Makefile.local "$dir" cp "$srcdir"/"$dir"/Makefile.local "$dir"
@ -78,6 +80,8 @@ if [ "$srcdir" != "." ]; then
"$srcdir"/bindings/python-cffi/notmuch2 \ "$srcdir"/bindings/python-cffi/notmuch2 \
"$srcdir"/bindings/python-cffi/setup.py \ "$srcdir"/bindings/python-cffi/setup.py \
bindings/python-cffi/ bindings/python-cffi/
else
NOTMUCH_BUILDDIR=$NOTMUCH_SRCDIR
fi fi
# Set several defaults (optionally specified by the user in # 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). # directory (the current directory at the time configure was run).
srcdir = ${srcdir} srcdir = ${srcdir}
NOTMUCH_SRCDIR = ${NOTMUCH_SRCDIR} NOTMUCH_SRCDIR = ${NOTMUCH_SRCDIR}
NOTMUCH_BUILDDIR = ${NOTMUCH_BUILDDIR}
# subdirectories to build # subdirectories to build
subdirs = ${subdirs} subdirs = ${subdirs}