From: Tomi Ollila <tomi.ollila@iki.fi>
To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
Subject: Re: [PATCH] configure: calculate NOTMUCH_BUILDDIR, write to Makefile.config
Date: Wed, 29 Dec 2021 19:50:41 +0200 [thread overview]
Message-ID: <m28rw3jo5q.fsf@guru.guru-group.fi> (raw)
In-Reply-To: <20211223014445.1418772-1-david@tethera.net>
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
prev parent reply other threads:[~2021-12-29 17:50 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-23 1:44 [PATCH] configure: calculate NOTMUCH_BUILDDIR, write to Makefile.config David Bremner
2021-12-29 17:50 ` Tomi Ollila [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m28rw3jo5q.fsf@guru.guru-group.fi \
--to=tomi.ollila@iki.fi \
--cc=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).