X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=619392d39562aa1f6553e762b91b01106f689061;hp=076efc79b9532c3e1b80a8ef5b9687456a2fe895;hb=f920ff59b91b17959c90e3969ef20e29a94b51a0;hpb=b5d8fe278425f7be49b6819e8187efffdffbd836

diff --git a/Makefile b/Makefile
index 076efc79..619392d3 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,29 @@ all:
 subdirs = compat completion emacs lib
 
 # We make all targets depend on the Makefiles themselves.
-global_deps = Makefile Makefile.local \
+global_deps = Makefile Makefile.config Makefile.local \
 	$(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
 
+# Sub-directory Makefile.local fragments can append to these variables
+# to have directory-specific cflags as necessary.
+
+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.
+include Makefile.config
+Makefile.config: configure
+	@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
+
 # Finally, include all of the Makefile.local fragments where all the
 # real work is done.
-include Makefile.local $(subdirs:%=%/Makefile.local)
+
+include $(subdirs:%=%/Makefile.local) Makefile.local