From 0f3480919728def0c414866f8e635e94650eee82 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 10:40:45 -0700 Subject: [PATCH] Makefile: Eliminate the separate install-bash and install-zsh targets. Again, simplifying the interface to the Makefile. Installing these files doesn't require bash nor zsh to actually be installed, so there's little harm in just installing them unconditionally. --- Makefile.local | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/Makefile.local b/Makefile.local index bb8ea543..5c264298 100644 --- a/Makefile.local +++ b/Makefile.local @@ -172,12 +172,14 @@ notmuch.1.gz: notmuch.1 .PHONY: install install: all notmuch.1.gz - mkdir -p $(DESTDIR)$(prefix)/bin/ - mkdir -p $(DESTDIR)$(libdir)/ - mkdir -p $(DESTDIR)$(prefix)/include/ mkdir -p $(DESTDIR)$(prefix)/share/man/man1 - install notmuch-shared $(DESTDIR)$(prefix)/bin/notmuch install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ + mkdir -p $(DESTDIR)$(bash_completion_dir) + install -m0644 contrib/notmuch-completion.bash $(DESTDIR)$(bash_completion_dir)/notmuch + mkdir -p $(DESTDIR)$(zsh_completion_dir) + install -m0644 contrib/notmuch-completion.zsh $(DESTDIR)$(zsh_completion_dir)/notmuch + mkdir -p $(DESTDIR)$(prefix)/bin/ + install notmuch-shared $(DESTDIR)$(prefix)/bin/notmuch ifeq ($(MAKECMDGOALS), install) @echo "" @echo "Notmuch is now installed to $(DESTDIR)$(prefix)" @@ -187,13 +189,6 @@ ifeq ($(MAKECMDGOALS), install) @echo " (require 'notmuch)" @echo "" @echo "And should then run \"M-x notmuch\" from within emacs or run \"emacs -f notmuch\"" - @echo "" - @echo "You may now want to install additional components to support using notmuch" - @echo "together with other software packages:" - @echo "" - @echo " make install-bash" - @echo " make install-zsh" - @echo "" endif .PHONY: install-desktop @@ -201,15 +196,5 @@ install-desktop: mkdir -p $(DESTDIR)$(desktop_dir) desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop -.PHONY: install-bash -install-bash: - mkdir -p $(DESTDIR)$(bash_completion_dir) - install -m0644 contrib/notmuch-completion.bash $(DESTDIR)$(bash_completion_dir)/notmuch - -.PHONY: install-zsh -install-zsh: - mkdir -p $(DESTDIR)$(zsh_completion_dir) - install -m0644 contrib/notmuch-completion.zsh $(DESTDIR)$(zsh_completion_dir)/notmuch - SRCS := $(SRCS) $(notmuch_client_srcs) CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc notmuch.1.gz