diff options
| author | David Bremner <david@tethera.net> | 2021-12-22 21:44:45 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-12-29 14:12:03 -0400 |
| commit | 14c4f9441d7fe0893003a5e793e19f1e55c9f73f (patch) | |
| tree | be4543c2dee2c298b4cb57fa268171ce4f191e37 | |
| parent | 25e0f5e59293ce961549201fdc74f81a3cc1675c (diff) | |
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.
| -rwxr-xr-x | configure | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -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} |