Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id E01BE431FD7 for ; Tue, 27 Aug 2013 10:43:19 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6y-gDlsS66Oz for ; Tue, 27 Aug 2013 10:43:13 -0700 (PDT) Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) by olra.theworths.org (Postfix) with ESMTP id 93972431FD6 for ; Tue, 27 Aug 2013 10:43:13 -0700 (PDT) Received: by guru.guru-group.fi (Postfix, from userid 501) id C67B31000F4; Tue, 27 Aug 2013 20:43:03 +0300 (EEST) From: Tomi Ollila To: notmuch@notmuchmail.org Subject: [PATCH 1/1] emacs: Makefile.local: HAVE_EMACS usage fixes Date: Tue, 27 Aug 2013 20:43:01 +0300 Message-Id: <1377625381-23440-1-git-send-email-tomi.ollila@iki.fi> X-Mailer: git-send-email 1.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: tomi.ollila@iki.fi X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Aug 2013 17:43:20 -0000 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. --- I tested this first by running tests normally. Next with ./configure --without-emacs (after make distclean). Then I did this: diff --git a/configure b/configure index 6166917..3640b47 100755 --- a/configure +++ b/configure @@ -363,3 +363,3 @@ fi printf "Checking if emacs is available... " -if emacs --quick --batch > /dev/null 2>&1; then +if eemacs --quick --batch > /dev/null 2>&1; then printf "Yes.\n" @@ -658,3 +658,3 @@ CXX = ${CXX} # Command to execute emacs from Makefiles -EMACS = emacs --quick +EMACS = eemacs --quick to hide emacs (make distclean; ./configure; make) All of these worked as expected. Tested the latest with current master (i.e without this patch): $ make Use "make V=1" to see the verbose compile lines. EMACS emacs/.eldeps /bin/sh: eemacs: command not found make: Nothing to be done for `all'. (although it seems to work, it complains...) Finally, after applying this patch (and restoring configure), ./configure && make install-emacs DESTDIR=$HOME/DDIR worked fine (without this patch the above gives: install: cannot stat ‘emacs/notmuch-lib.elc’: No such file or directory install: cannot stat ‘emacs/notmuch-parser.elc’: No such file or directory ...) emacs/Makefile.local | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/emacs/Makefile.local b/emacs/Makefile.local index a910aff..a7e967e 100644 --- a/emacs/Makefile.local +++ b/emacs/Makefile.local @@ -28,19 +28,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 -- 1.8.0