test: save buffer content to file instead of printing it in Emacs tests

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index 7549b40d171fdde519697e5fe3d67de307ddbf20..11e3a3d96293255e136ed3d06ab99557e7047340 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,17 +16,24 @@ extra_cflags :=
 extra_cxxflags :=
 
 # Get settings from the output of configure by running it to generate
-# Makefile.config if it doesn't exist yet. And add Makefile.config to
-# our global dependency list.
+# Makefile.config if it doesn't exist yet.
+
+# If Makefile.config doesn't exist, then srcdir won't be
+# set. Conditionally set it (assuming a plain srcdir build) so that
+# the rule to generate Makefile.config can actually work.
+srcdir ?= .
+
 include Makefile.config
-Makefile.config: configure
+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.