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

diff --git a/a7/f45794c38ffef2d8a04593d11e3e19642eddb5 b/a7/f45794c38ffef2d8a04593d11e3e19642eddb5
new file mode 100644 (file)
index 0000000..e2d36dd
--- /dev/null
+++ b/a7/f45794c38ffef2d8a04593d11e3e19642eddb5
@@ -0,0 +1,121 @@
+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 1F3EC431FC2\r
+       for <notmuch@notmuchmail.org>; Wed, 15 May 2013 03:58:57 -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 2hwz7wfir42B for <notmuch@notmuchmail.org>;\r
+       Wed, 15 May 2013 03:58:49 -0700 (PDT)\r
+Received: from mail-ee0-f46.google.com (mail-ee0-f46.google.com\r
+ [74.125.83.46])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 3E066431FC3   for <notmuch@notmuchmail.org>; Wed, 15 May 2013 03:58:49 -0700\r
+ (PDT)\r
+Received: by mail-ee0-f46.google.com with SMTP id e49so948489eek.5\r
+       for <notmuch@notmuchmail.org>; Wed, 15 May 2013 03:58:48 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=x-received:from:to:cc:subject:date:message-id:x-mailer\r
+       :x-gm-message-state;\r
+       bh=EJkWlZRQq8x0B5B4Wc6sNFzIT3BzJBY2tq/lspUW7UA=;\r
+       b=bnbTJVgZoKwANqsOxS47PON9PrtjNymOBZqVXZ2KSUADO6q1q1RDTLlBwi3ZDGS2js\r
+       RWjJxyz3aN0m72yFSnI5+IwlzMqQhip+c7il1wePixSGWi2Pb+QRkIffUZzjucqVAIUo\r
+       IL08VDLFIp039XAYXoO+uuGoY6ygWOUoT6yzCiVB9pO/D50aCs126sU/ZiCTRvm2QldX\r
+       0uZ+PMQp6eQJCI+ZnonvUPxzIeG/DJFrOQdAhKpzWOem3D4y/gJSd3dsuM22h/o8HkHY\r
+       vrCBCST6w9OrXi/lBm9SKUYyPOxtkuvRxwMcnJUnfAIOKz8fetPJA24MIMEaVIwlfBRh\r
+       0Y/w==\r
+X-Received: by 10.14.0.129 with SMTP id 1mr101361804eeb.43.1368615526701;\r
+       Wed, 15 May 2013 03:58:46 -0700 (PDT)\r
+Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3])\r
+       by mx.google.com with ESMTPSA id l6sm3139641eem.9.2013.05.15.03.58.44\r
+       for <multiple recipients>\r
+       (version=TLSv1.1 cipher=RC4-SHA bits=128/128);\r
+       Wed, 15 May 2013 03:58:45 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] build: fix out-of-tree builds\r
+Date: Wed, 15 May 2013 12:58:39 +0200\r
+Message-Id: <1368615519-25977-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.2.5\r
+X-Gm-Message-State:\r
+ ALoCoQmE6ZVNiQwhA+uPIiNmKlBuYRK3aNxFxvZ3fg8IQIOXqhhLwf/2BuV5VFjt1rPL16xzm72o\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: Wed, 15 May 2013 10:58:57 -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                        |    3 +--\r
+ performance-test/Makefile.local |    2 +-\r
+ 2 files changed, 2 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/Makefile b/Makefile\r
+index 73a8554..3301d30 100644\r
+--- a/Makefile\r
++++ b/Makefile\r
+@@ -3,8 +3,7 @@\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
++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.2.5\r
+\r