From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Sat, 10 May 2014 21:36:43 +0000 (+0300)
Subject: [PATCH] emacs install: make sure all components to be installed are there
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c753fad59bffd336fd933fd26dba524b9845deff;p=notmuch-archives.git

[PATCH] emacs install: make sure all components to be installed are there
---

diff --git a/c8/3ddec43d0cbb5e0d921e8a2eb2424baf458fb6 b/c8/3ddec43d0cbb5e0d921e8a2eb2424baf458fb6
new file mode 100644
index 000000000..737892f0d
--- /dev/null
+++ b/c8/3ddec43d0cbb5e0d921e8a2eb2424baf458fb6
@@ -0,0 +1,76 @@
+Return-Path: <too@guru-group.fi>
+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 1D520431FC0
+	for <notmuch@notmuchmail.org>; Sat, 10 May 2014 14:36:58 -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 7k4tVp5TCX4w for <notmuch@notmuchmail.org>;
+	Sat, 10 May 2014 14:36:54 -0700 (PDT)
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
+	by olra.theworths.org (Postfix) with ESMTP id CED1D431FBF
+	for <notmuch@notmuchmail.org>; Sat, 10 May 2014 14:36:53 -0700 (PDT)
+Received: by guru.guru-group.fi (Postfix, from userid 501)
+	id 5EAA41000F2; Sun, 11 May 2014 00:36:45 +0300 (EEST)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: notmuch@notmuchmail.org
+Subject: [PATCH] emacs install: make sure all components to be installed are
+	there
+Date: Sun, 11 May 2014 00:36:43 +0300
+Message-Id: <1399757803-26852-1-git-send-email-tomi.ollila@iki.fi>
+X-Mailer: git-send-email 1.8.0
+In-Reply-To:
+ <CAJOeo-1=o8RFVnT56wChTG=MHXNNsWNgYAoqhaSpFLzUn0D8_g@mail.gmail.com>
+References:
+ <CAJOeo-1=o8RFVnT56wChTG=MHXNNsWNgYAoqhaSpFLzUn0D8_g@mail.gmail.com>
+Cc: Tomi Ollila <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."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Sat, 10 May 2014 21:36:58 -0000
+
+`make install-emacs` will copy $(emacs_sources), $(emacs_images) and
+$(emacs_bytecode) to their target directories. $(emacs_bytecode) was
+already a prerequisite of make install-emacs as these obviously needed
+to be build. Until a while ago all of $(emacs_sources) was available
+in the repository, but now it includes `notmuch-version.el` which
+is generated. In the future we may have generated emacs images too.
+---
+
+I tested this with `make install` and `make install HAVE_EMACS=0`
+
+ emacs/Makefile.local | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/emacs/Makefile.local b/emacs/Makefile.local
+index dcb4995323af..c0d6b190c3c8 100644
+--- a/emacs/Makefile.local
++++ b/emacs/Makefile.local
+@@ -69,7 +69,7 @@ install: install-emacs
+ endif
+ 
+ .PHONY: install-emacs
+-install-emacs:
++install-emacs: $(emacs_sources) $(emacs_images)
+ 	mkdir -p "$(DESTDIR)$(emacslispdir)"
+ 	install -m0644 $(emacs_sources) "$(DESTDIR)$(emacslispdir)"
+ ifeq ($(HAVE_EMACS),1)
+-- 
+1.8.0
+