* [PATCH] configure: calculate NOTMUCH_BUILDDIR, write to Makefile.config
@ 2021-12-23 1:44 David Bremner
2021-12-29 17:50 ` Tomi Ollila
0 siblings, 1 reply; 2+ messages in thread
From: David Bremner @ 2021-12-23 1:44 UTC (permalink / raw)
To: notmuch
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] configure: calculate NOTMUCH_BUILDDIR, write to Makefile.config
2021-12-23 1:44 [PATCH] configure: calculate NOTMUCH_BUILDDIR, write to Makefile.config David Bremner
@ 2021-12-29 17:50 ` Tomi Ollila
0 siblings, 0 replies; 2+ messages in thread
From: Tomi Ollila @ 2021-12-29 17:50 UTC (permalink / raw)
To: David Bremner, notmuch
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-12-29 17:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-23 1:44 [PATCH] configure: calculate NOTMUCH_BUILDDIR, write to Makefile.config David Bremner
2021-12-29 17:50 ` Tomi Ollila
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).