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

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index bf81c03da1f75afe4de5e7a5e8c41037f99ec098..b6d3db3cd8f19f0f4ffe382d123222c2145318a2 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -20,21 +20,21 @@ notmuch_client_srcs =               \
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 notmuch: $(notmuch_client_modules) lib/notmuch.a
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 notmuch: $(notmuch_client_modules) lib/notmuch.a

-       $(CXX) $^ $(LDFLAGS) -o $@
+       $(call quiet,CXX) $^ $(LDFLAGS) -o $@

 
 notmuch.1.gz: notmuch.1
 
 notmuch.1.gz: notmuch.1

-       gzip --stdout notmuch.1 > notmuch.1.gz
+       $(call quiet,gzip) --stdout $^ > $@

 
 install: all notmuch.1.gz
        for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \
 
 install: all notmuch.1.gz
        for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \

-               $(DESTDIR)/etc/bash_completion.d/ ; \
+               $(DESTDIR)$(bash_completion_dir) ; \

        do \
                install -d $$d ; \
        done ;
        install notmuch $(DESTDIR)$(prefix)/bin/
        install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
        do \
                install -d $$d ; \
        done ;
        install notmuch $(DESTDIR)$(prefix)/bin/
        install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/

-       install notmuch-completion.bash \
-               $(DESTDIR)/etc/bash_completion.d/notmuch
+       install contrib/notmuch-completion.bash \
+               $(DESTDIR)$(bash_completion_dir)/notmuch

 
 install-emacs: install emacs
        for d in $(DESTDIR)/$(emacs_lispdir) ; \
 
 install-emacs: install emacs
        for d in $(DESTDIR)/$(emacs_lispdir) ; \