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

diff --git a/Makefile b/Makefile
index 5d8f3216..ae0f9912 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.
@@ -33,6 +35,9 @@ include Makefile.local
 include lib/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 +78,6 @@ DEPS := $(SRCS:%.c=.deps/%.d)
 DEPS := $(DEPS:%.cc=.deps/%.d)
 -include $(DEPS)
 
+.PHONY : clean
 clean:
 	rm -f $(CLEAN); rm -rf .deps