Makefile: Eliminate the separate install-bash and install-zsh targets.
authorCarl Worth <cworth@cworth.org>
Tue, 6 Apr 2010 17:40:45 +0000 (10:40 -0700)
committerCarl Worth <cworth@cworth.org>
Tue, 6 Apr 2010 21:36:31 +0000 (14:36 -0700)
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

index bb8ea543d01a283c08031961e72c13af86855f0f..5c2642981f9f3924b8a938733a17586fa1194068 100644 (file)
@@ -172,12 +172,14 @@ notmuch.1.gz: notmuch.1
 
 .PHONY: install
 install: all notmuch.1.gz
 
 .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
        mkdir -p $(DESTDIR)$(prefix)/share/man/man1
-       install notmuch-shared $(DESTDIR)$(prefix)/bin/notmuch
        install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
        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)"
 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 " (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
 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
 
        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
 SRCS  := $(SRCS) $(notmuch_client_srcs)
 CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) notmuch.elc notmuch.1.gz