[PATCH] configure: calculate NOTMUCH_BUILDDIR, write to Makefile.config

[PATCH] configure: calculate NOTMUCH_BUILDDIR, write to Makefile.config

[David Bremner]

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.
---
 configure | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configure b/configure
index d399457a..e7bb7edc 100755
--- a/configure
+++ b/configure
@@ -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
@@ -1247,6 +1251,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}
-- 
2.34.1

Re: [PATCH] configure: calculate NOTMUCH_BUILDDIR, write to Makefile.config

[Tomi Ollila]

On Wed, Dec 22 2021, David Bremner wrote:

> 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.

LGTM.

Tomi


> ---
>  configure | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/configure b/configure
> index d399457a..e7bb7edc 100755
> --- a/configure
> +++ b/configure
> @@ -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
> @@ -1247,6 +1251,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}
> -- 
> 2.34.1
>
> _______________________________________________
> notmuch mailing list -- notmuch@notmuchmail.org
> To unsubscribe send an email to notmuch-leave@notmuchmail.org