aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Carl Worth <cworth@cworth.org>2009-11-22 04:45:16 +0100
committerGravatar Carl Worth <cworth@cworth.org>2009-11-22 04:45:16 +0100
commit1266d8511e9adc7296ec4ddbf609dec824b4c94f (patch)
treea442bf47b26c795acb7c599dbb2feae94bf63001
parent530df68258ea0fbdceafd6e4a0f51889c6ee86d2 (diff)
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.
-rw-r--r--Makefile4
-rw-r--r--Makefile.local2
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 5d8f3216..ae8bff13 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.
diff --git a/Makefile.local b/Makefile.local
index 5fd5d4f4..b6d3db3c 100644
--- 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 \