X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2FMakefile.local;h=4fee0e89c3dc7e5ac0c17db11c2aa4d118bc7f70;hp=95b6fa456c48d57eab48db2833d0c20e84454ae3;hb=19ec74c5;hpb=e8414a72d478b55d2a5dd8b2fb30c67ee60b1732

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 95b6fa45..4fee0e89 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -4,23 +4,42 @@ dir := emacs
 emacs_sources := \
 	$(dir)/notmuch-lib.el \
 	$(dir)/notmuch.el \
-	$(dir)/notmuch-show.el
-
-emacs_bytecode := $(subst .el,.elc,$(emacs_sources))
-
-emacs: $(emacs_bytecode)
-
-install-emacs: install emacs
-	$(call quiet_mkdir, $(DESTDIR)/$(emacs_lispdir))
-	$(call quiet_install_data, $(emacs_sources) $(emacs_bytecode) $(DESTDIR)$(emacs_lispdir))
-	@echo ""
-	@echo "The notmuch emacs client is now installed."
-	@echo ""
-	@echo "To run this, each user should add the following line to the ~/.emacs file:"
-	@echo ""
-	@echo "	(require 'notmuch)"
-	@echo ""
-	@echo "And should then run \"M-x notmuch\" from within emacs or run \"emacs -f notmuch\""
-	@echo ""
+	$(dir)/notmuch-query.el \
+	$(dir)/notmuch-show.el \
+	$(dir)/notmuch-wash.el \
+	$(dir)/notmuch-hello.el \
+	$(dir)/notmuch-mua.el \
+	$(dir)/notmuch-address.el \
+	$(dir)/notmuch-maildir-fcc.el \
+	$(dir)/notmuch-message.el \
+	$(dir)/notmuch-crypto.el \
+	$(dir)/coolj.el \
+	$(dir)/notmuch-print.el
+
+emacs_images := \
+	$(srcdir)/$(dir)/notmuch-logo.png
+
+emacs_bytecode = $(emacs_sources:.el=.elc)
+
+%.elc: %.el $(global_deps)
+	$(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<
+
+ifeq ($(WITH_EMACS),1)
+ifeq ($(HAVE_EMACS),1)
+all: $(emacs_bytecode)
+endif
+
+install: install-emacs
+endif
+
+.PHONY: install-emacs
+install-emacs:
+	mkdir -p "$(DESTDIR)$(emacslispdir)"
+	install -m0644 $(emacs_sources) "$(DESTDIR)$(emacslispdir)"
+ifeq ($(HAVE_EMACS),1)
+	install -m0644 $(emacs_bytecode) "$(DESTDIR)$(emacslispdir)"
+endif
+	mkdir -p "$(DESTDIR)$(emacsetcdir)"
+	install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)"
 
 CLEAN := $(CLEAN) $(emacs_bytecode)