Makefile: Eliminate the separate install-bash and install-zsh targets.

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index da31982c42dc73ef0de59df4c5f5a92b737b4042..5c2642981f9f3924b8a938733a17586fa1194068 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -118,9 +118,6 @@ quiet ?= $($(shell echo $1 | sed -e s'/ .*//'))
 %.o: %.c $(global_deps)
        $(call quiet,CC $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@
 
-%.elc: %.el
-       $(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<
-
 .deps/%.d: %.c $(global_deps)
        @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \
        $(CC) -M $(CPPFLAGS) $(FINAL_CFLAGS) $< > $@.$$$$ 2>/dev/null ; \
@@ -175,23 +172,23 @@ 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."
+       @echo "Notmuch is now installed to $(DESTDIR)$(prefix)"
        @echo ""
-       @echo "You may now want to install additional components to support using notmuch"
-       @echo "together with other software packages:"
+       @echo "To run notmuch from emacs, each user should add the following line to ~/.emacs:"
        @echo ""
-       @echo " make install-emacs"
-       @echo " make install-bash"
-       @echo " make install-zsh"
+       @echo " (require 'notmuch)"
        @echo ""
+       @echo "And should then run \"M-x notmuch\" from within emacs or run \"emacs -f notmuch\""
 endif
 
 .PHONY: install-desktop
@@ -199,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