[PATCH v2] build: fix out-of-tree builds

diff --git a/4a/450b7bdfa2b27b5cdc689f5707d668be77f22b b/4a/450b7bdfa2b27b5cdc689f5707d668be77f22b
new file mode 100644 (file)
index 0000000..4d500ed
--- /dev/null
+++ b/4a/450b7bdfa2b27b5cdc689f5707d668be77f22b
@@ -0,0 +1,128 @@
+Return-Path: <jani@nikula.org>\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 16431431FC0\r
+       for <notmuch@notmuchmail.org>; Sat, 25 May 2013 04:19:13 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 0lUIcN9bQV5u for <notmuch@notmuchmail.org>;\r
+       Sat, 25 May 2013 04:19:05 -0700 (PDT)\r
+Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com\r
+       [209.85.217.178]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 917D8431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 25 May 2013 04:19:05 -0700 (PDT)\r
+Received: by mail-lb0-f178.google.com with SMTP id w10so5486840lbi.37\r
+       for <notmuch@notmuchmail.org>; Sat, 25 May 2013 04:19:04 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+       :x-gm-message-state;\r
+       bh=HWZ2hz8RF4Y3jNGITcOBkNepgkttxmAMy8oyp1lFIWQ=;\r
+       b=YvVa6/dA77Y/C5HdNfUBWG526EiEY2lnuktGwxCocyalv15mox94nQ15k4ivxBzn+q\r
+       TORib5Oxh84V242/09/Dlz98/FxAA5wloR6LNaX+bPSEo4YNZDN5PGE+3x90qo1BLNGU\r
+       0RVKDweckHgeiDYA7WC86RHK/cB7TVY02Av6JlSRNMy6dRhOtVFtDDejTl09m7G+Snn7\r
+       Pdamgicr4kxt3Jx041A4YvL+xr77dN2rs13meCwiSkmeedM+C2GVHZmwpxZ60bNeaouh\r
+       6R4j/tUSoF2fDAZigGVVpzm6kxxl210JIyGxC00WROIdoY0Gw3ZMkFCeoiIv05/OS4sD\r
+       S+Hw==\r
+X-Received: by 10.112.60.8 with SMTP id d8mr3504005lbr.39.1369480744050;\r
+       Sat, 25 May 2013 04:19:04 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c376-211.dhcp.inet.fi.\r
+       [88.195.118.211])\r
+       by mx.google.com with ESMTPSA id f9sm8088210lbf.4.2013.05.25.04.19.02\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 25 May 2013 04:19:03 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2] build: fix out-of-tree builds\r
+Date: Sat, 25 May 2013 14:18:58 +0300\r
+Message-Id: <1369480738-16551-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1368615519-25977-1-git-send-email-jani@nikula.org>\r
+References: <1368615519-25977-1-git-send-email-jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQlA08hiJD25b8pCM2j6CP4sKZ6tfw+LvAQxWKh6B3z9fvnf/dS35oal1cEmRerZggDlqxSq\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, 25 May 2013 11:19:13 -0000\r
+\r
+Support for out-of-tree builds was added in\r
+commit 3e4a9d60a9419621b08c647a306843d76c47c2cb\r
+Author: Carl Worth <cworth@cworth.org>\r
+Date:   Wed Mar 9 15:02:42 2011 -0800\r
+\r
+    build: Add support for non-source-directory builds.\r
+\r
+and broken in\r
+commit 7beeb8c88a014ecbc53d8241f10683b3c4c16228\r
+Author: David Bremner <bremner@debian.org>\r
+Date:   Sat Nov 17 12:28:15 2012 -0400\r
+\r
+    test: initial performance testing infrastructure\r
+\r
+Fix the build breakage.\r
+\r
+Out-of-tree 'make test' has been broken since earlier than the above,\r
+and remains broken, as does out-of-tree perf test, but at least the\r
+build now works.\r
+\r
+---\r
+\r
+I didn't have the time to dig into the test and perf test breakage.\r
+---\r
+ Makefile                        |    7 ++++---\r
+ performance-test/Makefile.local |    2 +-\r
+ 2 files changed, 5 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/Makefile b/Makefile\r
+index 73a8554..0428160 100644\r
+--- a/Makefile\r
++++ b/Makefile\r
+@@ -2,9 +2,10 @@\r
+ # given explicitly on the command line) so mention it first.\r
+ all:\r
+ \r
+-# List all subdirectories here. Each contains its own Makefile.local\r
+-subdirs := compat completion emacs lib man parse-time-string\r
+-subdirs += performance-test util test\r
++# List all subdirectories here. Each contains its own Makefile.local.\r
++# Use of '=', without '+=', seems to be required for out-of-tree\r
++# builds to work.\r
++subdirs = compat completion emacs lib man parse-time-string performance-test util test\r
+ \r
+ # We make all targets depend on the Makefiles themselves.\r
+ global_deps = Makefile Makefile.config Makefile.local \\r
+diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local\r
+index 73aa963..e47219a 100644\r
+--- a/performance-test/Makefile.local\r
++++ b/performance-test/Makefile.local\r
+@@ -2,7 +2,7 @@\r
+ \r
+ dir := performance-test\r
+ \r
+-include $(dir)/version.sh\r
++include $(srcdir)/$(dir)/version.sh\r
+ \r
+ TIME_TEST_SCRIPT := ${dir}/notmuch-time-test\r
+ MEMORY_TEST_SCRIPT := ${dir}/notmuch-memory-test\r
+-- \r
+1.7.10.4\r
+\r