1 Return-Path: <too@guru-group.fi>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 75B0A431FD7
\r
6 for <notmuch@notmuchmail.org>; Tue, 27 Aug 2013 12:00:57 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id 8jJMRCfAJAxH for <notmuch@notmuchmail.org>;
\r
16 Tue, 27 Aug 2013 12:00:53 -0700 (PDT)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by olra.theworths.org (Postfix) with ESMTP id 5D052431FD6
\r
19 for <notmuch@notmuchmail.org>; Tue, 27 Aug 2013 12:00:53 -0700 (PDT)
\r
20 Received: by guru.guru-group.fi (Postfix, from userid 501)
\r
21 id DF91E1000F4; Tue, 27 Aug 2013 22:00:48 +0300 (EEST)
\r
22 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
23 To: notmuch@notmuchmail.org
\r
24 Subject: [PATCH 1/1] emacs: Makefile.local: HAVE_EMACS usage fixes
\r
25 Date: Tue, 27 Aug 2013 22:00:47 +0300
\r
26 Message-Id: <1377630047-27756-1-git-send-email-tomi.ollila@iki.fi>
\r
27 X-Mailer: git-send-email 1.8.0
\r
29 Content-Type: text/plain; charset=UTF-8
\r
30 Content-Transfer-Encoding: 8bit
\r
31 Cc: tomi.ollila@iki.fi
\r
32 X-BeenThere: notmuch@notmuchmail.org
\r
33 X-Mailman-Version: 2.1.13
\r
35 List-Id: "Use and development of the notmuch mail system."
\r
36 <notmuch.notmuchmail.org>
\r
37 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
38 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
39 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
40 List-Post: <mailto:notmuch@notmuchmail.org>
\r
41 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
42 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
43 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
44 X-List-Received-Date: Tue, 27 Aug 2013 19:00:57 -0000
\r
46 If we don't have emacs, disable targets that used EMACS while doing
\r
47 the recipes of that target.
\r
49 If we do have emacs, make install-emacs depend on *.elc files,
\r
50 as making the target will attempt to install those.
\r
53 This obsoletes id:1377625381-23440-1-git-send-email-tomi.ollila@iki.fi
\r
54 -- the "patch" in comment section was applied by git am ;/
\r
56 I tested this first by running tests normally.
\r
57 Next with ./configure --without-emacs (after make distclean).
\r
60 | diff --git a/configure b/configure
\r
61 | index 6166917..3640b47 100755
\r
64 | @@ -363,3 +363,3 @@ fi
\r
65 | printf "Checking if emacs is available... "
\r
66 | -if emacs --quick --batch > /dev/null 2>&1; then
\r
67 | +if eemacs --quick --batch > /dev/null 2>&1; then
\r
69 | @@ -658,3 +658,3 @@ CXX = ${CXX}
\r
70 | # Command to execute emacs from Makefiles
\r
71 | -EMACS = emacs --quick
\r
72 | +EMACS = eemacs --quick
\r
74 to hide emacs (make distclean; ./configure; make)
\r
76 All of these worked as expected.
\r
79 Tested the latest with current master (i.e without this patch):
\r
82 Use "make V=1" to see the verbose compile lines.
\r
84 /bin/sh: eemacs: command not found
\r
85 make: Nothing to be done for `all'.
\r
87 (although it seems to work, it complains...)
\r
89 Finally, after applying this patch (and restoring configure),
\r
90 ./configure && make install-emacs DESTDIR=$HOME/DDIR worked fine
\r
92 (without this patch the above gives:
\r
93 install: cannot stat ‘emacs/notmuch-lib.elc’: No such file or directory
\r
94 install: cannot stat ‘emacs/notmuch-parser.elc’: No such file or directory
\r
98 emacs/Makefile.local | 5 +++++
\r
99 1 file changed, 5 insertions(+)
\r
101 diff --git a/emacs/Makefile.local b/emacs/Makefile.local
\r
102 index a910aff..a7e967e 100644
\r
103 --- a/emacs/Makefile.local
\r
104 +++ b/emacs/Makefile.local
\r
105 @@ -28,19 +28,24 @@ emacs_bytecode = $(emacs_sources:.el=.elc)
\r
106 # the byte compiler may load an old .elc file when processing a
\r
107 # "require" or we may fail to rebuild a .elc that depended on a macro
\r
108 # from an updated file.
\r
109 +ifeq ($(HAVE_EMACS),1)
\r
110 $(dir)/.eldeps: $(dir)/Makefile.local $(dir)/make-deps.el $(emacs_sources)
\r
111 $(call quiet,EMACS) --directory emacs -batch -l make-deps.el \
\r
112 -f batch-make-deps $(emacs_sources) > $@.tmp && \
\r
113 (cmp -s $@.tmp $@ || mv $@.tmp $@)
\r
114 -include $(dir)/.eldeps
\r
116 CLEAN+=$(dir)/.eldeps $(dir)/.eldeps.tmp
\r
118 +ifeq ($(HAVE_EMACS),1)
\r
119 %.elc: %.el $(global_deps)
\r
120 $(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<
\r
123 ifeq ($(WITH_EMACS),1)
\r
124 ifeq ($(HAVE_EMACS),1)
\r
125 all: $(emacs_bytecode)
\r
126 +install-emacs: $(emacs_bytecode)
\r
129 install: install-emacs
\r