X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=configure;h=e7bb7edcbda39ee4184689e7797532382c426d3e;hb=9cc026f3daaa7731527787f8c7e729c0a08c456c;hp=7d9df3708a315ab5bdae7badbc8239d271f412b6;hpb=a06b76b9b3c1212b17d2bb170bdd511711f578f8;p=notmuch

diff --git a/configure b/configure
index 7d9df370..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
@@ -734,6 +738,7 @@ if command -v ${BASHCMD} > /dev/null; then
     printf "Yes (%s).\n" "$bash_absolute"
 else
     have_bash=0
+    bash_absolute=
     printf "No. (%s not found)\n" "${BASHCMD}"
 fi
 
@@ -744,6 +749,7 @@ if command -v ${PERL} > /dev/null; then
     printf "Yes (%s).\n" "$perl_absolute"
 else
     have_perl=0
+    perl_absolute=
     printf "No. (%s not found)\n" "${PERL}"
 fi
 
@@ -1245,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}