X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2FMakefile.local;h=1c09d87aa8f33c2dd453392c2b7a15a346ae29d2;hb=40de245862a26f008c97ea7460620872bda808ae;hp=00d309cffdd5cf0a98f0d0ab8cd0b08b5c0961c6;hpb=36245db69d24df8995615fd48e5dca8728e5042e;p=notmuch

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 00d309cf..1c09d87a 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -11,29 +11,32 @@ emacs_sources := \
 	$(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
+	$(srcdir)/$(dir)/notmuch-logo.png
 
-emacs_bytecode := $(subst .el,.elc,$(emacs_sources))
+emacs_bytecode = $(emacs_sources:.el=.elc)
 
 %.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:
-	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)
+	install -m0644 $(emacs_images) "$(DESTDIR)$(emacslispdir)"
 
 CLEAN := $(CLEAN) $(emacs_bytecode)