diff options
| author | Tomi Ollila <tomi.ollila@iki.fi> | 2017-03-12 13:59:12 +0200 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-03-12 09:16:54 -0300 |
| commit | 18914c725bd373f8cd6a5072df73ffe31653208c (patch) | |
| tree | 5600cae88903e9cee910a7bd37b40d800f47b8a3 | |
| parent | d56a801b6743971ff7f42404fe159260937405a1 (diff) | |
configure: add ${NOTMUCH_SRCDIR} -- absolute path to notmuch source
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.
| -rwxr-xr-x | configure | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -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" @@ -913,6 +918,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} @@ -1164,6 +1170,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} |
