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

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 95b6fa45..f759c0dc 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -4,23 +4,27 @@ dir := emacs
 emacs_sources := \
 	$(dir)/notmuch-lib.el \
 	$(dir)/notmuch.el \
-	$(dir)/notmuch-show.el
+	$(dir)/notmuch-query.el \
+	$(dir)/notmuch-show.el \
+	$(dir)/notmuch-wash.el
 
 emacs_bytecode := $(subst .el,.elc,$(emacs_sources))
 
-emacs: $(emacs_bytecode)
+%.elc: %.el
+	$(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<
 
-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 ""
+ifeq ($(HAVE_EMACS),1)
+all: $(emacs_bytecode)
+endif
+
+install: install-emacs
+
+.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
 
 CLEAN := $(CLEAN) $(emacs_bytecode)