util: Fix two corner-cases in boolean term quoting function

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index ffee659b0eb5f4ccf2921647838a16a66c2f6c69..061c55a1948aa821da17e1537c7da36c866606bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,11 @@
 # given explicitly on the command line) so mention it first.
 all:
 
-# List all subdirectories here. Each contains its own Makefile.local
-subdirs = compat completion emacs lib test
+# List all subdirectories here. Each contains its own Makefile.local.
+# Use of '=', without '+=', seems to be required for out-of-tree
+# builds to work.
+subdirs = compat completion doc emacs lib parse-time-string    \
+       performance-test util test test/test-databases
 
 # We make all targets depend on the Makefiles themselves.
 global_deps = Makefile Makefile.config Makefile.local \
@@ -25,13 +28,15 @@ srcdir ?= .
 
 include Makefile.config
 Makefile.config: $(srcdir)/configure
+ifeq ($(configure_options),)
        @echo ""
        @echo "Note: Calling ./configure with no command-line arguments. This is often fine,"
        @echo "      but if you want to specify any arguments (such as an alternate prefix"
        @echo "      into which to install), call ./configure explicitly and then make again."
        @echo "      See \"./configure --help\" for more details."
        @echo ""
-       ./configure
+endif
+       $(srcdir)/configure $(configure_options)
 
 # Finally, include all of the Makefile.local fragments where all the
 # real work is done.