X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile;h=c0b1b3fa60057cdc50b8188cdcaad5b39c7c7368;hp=5d8f3216028c8237b5ece727ea38290a5c65bcee;hb=3054bc462c8f31965f342808fce48c72f2858cfc;hpb=530df68258ea0fbdceafd6e4a0f51889c6ee86d2

diff --git a/Makefile b/Makefile
index 5d8f3216..c0b1b3fa 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,9 @@ CFLAGS=-O2
 
 # Additional programs that are used during the compilation process.
 EMACS ?= emacs
-GZIP ?= gzip
+# Lowercase to avoid clash with GZIP environment variable for passing
+# arguments to gzip.
+gzip = gzip
 
 # Additional flags that we will append to whatever the user set.
 # These aren't intended for the user to manipulate.
@@ -17,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
 
@@ -28,11 +32,16 @@ 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
+all: notmuch notmuch.1.gz
+
 include lib/Makefile.local
+include compat/Makefile.local
+include Makefile.local
 
 # And get user settings from the output of configure
+Makefile.config: configure
+	./configure
+
 include Makefile.config
 
 # The user has not set any verbosity, default to quiet mode and inform the
@@ -73,5 +82,6 @@ DEPS := $(SRCS:%.c=.deps/%.d)
 DEPS := $(DEPS:%.cc=.deps/%.d)
 -include $(DEPS)
 
+.PHONY : clean
 clean:
 	rm -f $(CLEAN); rm -rf .deps