emacs: Rework crypto switch toggle.

[notmuch] / emacs / Makefile.local

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 1c4166feca88d86164bc088d790685522f7f1062..4fee0e89c3dc7e5ac0c17db11c2aa4d118bc7f70 100644 (file)
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -12,14 +12,16 @@ emacs_sources := \
        $(dir)/notmuch-address.el \
        $(dir)/notmuch-maildir-fcc.el \
        $(dir)/notmuch-message.el \
-       $(dir)/coolj.el
+       $(dir)/notmuch-crypto.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)
@@ -37,6 +39,7 @@ install-emacs:
 ifeq ($(HAVE_EMACS),1)
        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)