X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=Makefile;h=7a9e44c629b833b27e3fbfe54fcd8657e49d78b2;hb=af4928eb3a0a40d7f3d2a3475289da1df5b9ce4f;hp=2cd1b1bae4af648b07b51a110e08f623868fa66e;hpb=685a8ad23be3ceac8387e32f49a4a387cae2434d;p=notmuch

diff --git a/Makefile b/Makefile
index 2cd1b1ba..7a9e44c6 100644
--- 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,22 +32,28 @@ 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),)
 quiet_DOC := "Use \"$(MAKE) V=1\" to see the verbose compile lines.\n"
-quiet = @echo $(quiet_DOC)$(eval quiet_DOC:=)"  $1	$@"; $($1)
+quiet = @printf $(quiet_DOC)$(eval quiet_DOC:=)"  $1	$@\n"; $($1)
 endif
 # The user has explicitly enabled quiet compilation.
 ifeq ($(V),0)
-quiet = @echo "  $1	$@"; $($1)
+quiet = @printf "  $1	$@\n"; $($1)
 endif
 # Otherwise, print the full command line.
 quiet ?= $($1)