[PATCH 1/3] configure: add ${NOTMUCH_SRCDIR} -- absolute path to notmuch source
Tomi Ollila
tomi.ollila at iki.fi
Sat Dec 3 04:53:22 PST 2016
The ${srcdir} -- usually relative path to notmuch source -- works fine
in current ./configure and all makefiles. To have simple access to
notmuch source in tests and out of tree builds holding absolute path to
the source directory is useful.
---
configure | 8 ++++++++
1 file changed, 8 insertions(+)
Version 3 of id:1480099848-17636-1-git-send-email-too at guru.guru-group.fi
now adding variable holding absolute path to notmuch source to *.config
files in ./configure
diff --git a/configure b/configure
index 72db26d..174b24a 100755
--- a/configure
+++ b/configure
@@ -19,7 +19,12 @@ To work around this problem you may try to execute:
# Store original IFS value so it can be changed (and restored) in many places.
readonly DEFAULT_IFS="$IFS"
+# The top-level directory for the source. This ./configure and all Makefiles
+# are good with ${srcdir} usually being relative. Some components (e.g. tests)
+# are executed in subdirectories and for those it is simpler to use
+# ${NOTMUCH_SRCDIR} which holds absolute path to the source.
srcdir=$(dirname "$0")
+NOTMUCH_SRCDIR=$(cd "$srcdir" && pwd)
subdirs="util compat lib parse-time-string completion doc emacs"
subdirs="${subdirs} performance-test test test/test-databases"
@@ -927,6 +932,7 @@ cat > Makefile.config <<EOF
# the configure script). This may be different than the build
# directory (the current directory at the time configure was run).
srcdir = ${srcdir}
+NOTMUCH_SRCDIR = ${NOTMUCH_SRCDIR}
# subdirectories to build
subdirs = ${subdirs}
@@ -1182,6 +1188,8 @@ cat > sh.config <<EOF
# This sh.config was automatically generated by the ./configure
# script of notmuch.
+NOTMUCH_SRCDIR='${NOTMUCH_SRCDIR}'
+
# Whether the Xapian version in use supports compaction
NOTMUCH_HAVE_XAPIAN_COMPACT=${have_xapian_compact}
--
2.10.0
More information about the notmuch
mailing list