X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2FMakefile.local;h=fb82247f32e51a294e58d03f805fd235603221d8;hb=5811550cdd51485ec7ea0f960139eb9ea1741451;hp=9ea8e491a6d6308f430f9d2d1b0b6554e27af803;hpb=26b4cc4aad93e25dab1e1f38f19f1ae69cde389c;p=notmuch

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 9ea8e491..fb82247f 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -12,14 +12,17 @@ emacs_sources := \
 	$(dir)/notmuch-address.el \
 	$(dir)/notmuch-maildir-fcc.el \
 	$(dir)/notmuch-message.el \
-	$(dir)/coolj.el
+	$(dir)/notmuch-crypto.el \
+	$(dir)/notmuch-tag.el \
+	$(dir)/coolj.el \
+	$(dir)/notmuch-print.el
 
 emacs_images := \
-	$(dir)/notmuch-logo.png
+	$(srcdir)/$(dir)/notmuch-logo.png
 
-emacs_bytecode := $(subst .el,.elc,$(emacs_sources))
+emacs_bytecode = $(emacs_sources:.el=.elc)
 
-%.elc: %.el
+%.elc: %.el $(global_deps)
 	$(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<
 
 ifeq ($(WITH_EMACS),1)
@@ -32,11 +35,12 @@ endif
 
 .PHONY: install-emacs
 install-emacs:
-	mkdir -p $(DESTDIR)$(emacslispdir)
-	install -m0644 $(emacs_sources) $(DESTDIR)$(emacslispdir)
+	mkdir -p "$(DESTDIR)$(emacslispdir)"
+	install -m0644 $(emacs_sources) "$(DESTDIR)$(emacslispdir)"
 ifeq ($(HAVE_EMACS),1)
-	install -m0644 $(emacs_bytecode) $(DESTDIR)$(emacslispdir)
+	install -m0644 $(emacs_bytecode) "$(DESTDIR)$(emacslispdir)"
 endif
-	install -m0644 $(emacs_images) $(DESTDIR)$(emacslispdir)
+	mkdir -p "$(DESTDIR)$(emacsetcdir)"
+	install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)"
 
 CLEAN := $(CLEAN) $(emacs_bytecode)