From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Tue, 27 Aug 2013 19:00:47 +0000 (+0300)
Subject: emacs: Makefile.local: HAVE_EMACS usage fixes
X-Git-Tag: 0.18_rc0~200
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f2a3d9799d68d567d2bdd43827ac158885a4c11b;p=notmuch.git

emacs: Makefile.local: HAVE_EMACS usage fixes

If we don't have emacs, disable targets that used EMACS while doing
the recipes of that target.

If we do have emacs, make install-emacs depend on *.elc files,
as making the target will attempt to install those.
---

diff --git a/emacs/Makefile.local b/emacs/Makefile.local
index 92467a31..42bfbd96 100644
--- a/emacs/Makefile.local
+++ b/emacs/Makefile.local
@@ -29,19 +29,24 @@ emacs_bytecode = $(emacs_sources:.el=.elc)
 # the byte compiler may load an old .elc file when processing a
 # "require" or we may fail to rebuild a .elc that depended on a macro
 # from an updated file.
+ifeq ($(HAVE_EMACS),1)
 $(dir)/.eldeps: $(dir)/Makefile.local $(dir)/make-deps.el $(emacs_sources)
 	$(call quiet,EMACS) --directory emacs -batch -l make-deps.el \
 		-f batch-make-deps $(emacs_sources) > $@.tmp && \
 		(cmp -s $@.tmp $@ || mv $@.tmp $@)
 -include $(dir)/.eldeps
+endif
 CLEAN+=$(dir)/.eldeps $(dir)/.eldeps.tmp
 
+ifeq ($(HAVE_EMACS),1)
 %.elc: %.el $(global_deps)
 	$(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<
+endif
 
 ifeq ($(WITH_EMACS),1)
 ifeq ($(HAVE_EMACS),1)
 all: $(emacs_bytecode)
+install-emacs: $(emacs_bytecode)
 endif
 
 install: install-emacs