From a5ed8c68f6db37d3866088a9770447eba6833109 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Tue, 6 Apr 2010 10:35:20 -0700 Subject: Makefile: Eliminate the "make install-emacs" target. Instead, simply byte-compile the emacs source files as part of "make" and install them as part of "make install". The byte compilation is made conditional on the configure script finding the emacs binary. That way, "make; make install" will still work for someone that doesn't have emacs installed, (which was the only reason we had made a separate "make install-emacs" target in the first place). --- Makefile.local | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'Makefile.local') diff --git a/Makefile.local b/Makefile.local index da31982..bb8ea54 100644 --- 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 ; \ @@ -183,12 +180,17 @@ install: all notmuch.1.gz install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/ ifeq ($(MAKECMDGOALS), install) @echo "" - @echo "Notmuch is now installed." + @echo "Notmuch is now installed to $(DESTDIR)$(prefix)" + @echo "" + @echo "To run notmuch from emacs, each user should add the following line to ~/.emacs:" + @echo "" + @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-emacs" @echo " make install-bash" @echo " make install-zsh" @echo "" -- cgit v1.2.3