configure: Assimilate new getlinetest into recent configure conventions.

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index 2cd1b1bae4af648b07b51a110e08f623868fa66e..17be8b482a03f1ade341f250ceb6fc7bdc341455 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,8 @@ ifeq ($(emacs_lispdir),)
        emacs_lispdir = $(prefix)/share/emacs/site-lisp
 endif
 
+bash_completion_dir = /etc/bash_completion.d
+
 all_deps = Makefile Makefile.local Makefile.config \
                   lib/Makefile lib/Makefile.local
 
@@ -30,13 +32,19 @@ override LDFLAGS += \
        $(shell pkg-config --libs glib-2.0 gmime-2.4 talloc) \
        $(shell xapian-config --libs)
 
-# Include our local Makefile.local first so that its first target is default
-include Makefile.local
-include lib/Makefile.local
+all: notmuch notmuch.1.gz
+
+# Before including any other Makefile fragments, get settings from the
+# output of configure
+Makefile.config: configure
+       ./configure
 
-# And get user settings from the output of configure
 include Makefile.config
 
+include lib/Makefile.local
+include compat/Makefile.local
+include Makefile.local
+
 # The user has not set any verbosity, default to quiet mode and inform the
 # user how to enable verbose compiles.
 ifeq ($(V),)