X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;ds=sidebyside;f=emacs%2FMakefile.local;h=9ea8e491a6d6308f430f9d2d1b0b6554e27af803;hb=26b4cc4aad93e25dab1e1f38f19f1ae69cde389c;hp=76cc64f9b66711c7894461b1521a794620fd4e76;hpb=4235ef510926c8b25aeb55966c8d990c1594be64;p=notmuch

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 76cc64f9..9ea8e491 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -5,25 +5,38 @@ emacs_sources := \
 	$(dir)/notmuch-lib.el \
 	$(dir)/notmuch.el \
 	$(dir)/notmuch-query.el \
-	$(dir)/notmuch-show.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)/coolj.el
+
+emacs_images := \
+	$(dir)/notmuch-logo.png
 
 emacs_bytecode := $(subst .el,.elc,$(emacs_sources))
 
-.PHONY: emacs
-emacs: $(emacs_bytecode)
+%.elc: %.el
+	$(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: 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 ""
+install-emacs:
+	mkdir -p $(DESTDIR)$(emacslispdir)
+	install -m0644 $(emacs_sources) $(DESTDIR)$(emacslispdir)
+ifeq ($(HAVE_EMACS),1)
+	install -m0644 $(emacs_bytecode) $(DESTDIR)$(emacslispdir)
+endif
+	install -m0644 $(emacs_images) $(DESTDIR)$(emacslispdir)
 
 CLEAN := $(CLEAN) $(emacs_bytecode)