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

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