Makefile: Fix to work even with GZIP environment variable set.

The rule here was written to assume that if the GZIP environment
variable was set that it would be the gzip binary to execute,
(similar to the CC and CXX variables). But GZIP is actually used
to pass arguments to gzip, so we have to use a different name.

diff --git a/Makefile b/Makefile
index 5d8f3216028c8237b5ece727ea38290a5c65bcee..ae8bff134a154544340bca9558aefe6639ff19d6 100644 (file)
--- 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.

diff --git a/Makefile.local b/Makefile.local
index 5fd5d4f4c792888800e3d22707b527629495282c..b6d3db3cd8f19f0f4ffe382d123222c2145318a2 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -23,7 +23,7 @@ notmuch: $(notmuch_client_modules) lib/notmuch.a
        $(call quiet,CXX) $^ $(LDFLAGS) -o $@
 
 notmuch.1.gz: notmuch.1
-       $(call quiet,GZIP) --stdout $^ > $@
+       $(call quiet,gzip) --stdout $^ > $@
 
 install: all notmuch.1.gz
        for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \