Return-Path: <jani@nikula.org>
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 16431431FC0
	for <notmuch@notmuchmail.org>; Sat, 25 May 2013 04:19:13 -0700 (PDT)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: -0.7
X-Spam-Level: 
X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
	tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 0lUIcN9bQV5u for <notmuch@notmuchmail.org>;
	Sat, 25 May 2013 04:19:05 -0700 (PDT)
Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com
	[209.85.217.178]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id 917D8431FAF
	for <notmuch@notmuchmail.org>; Sat, 25 May 2013 04:19:05 -0700 (PDT)
Received: by mail-lb0-f178.google.com with SMTP id w10so5486840lbi.37
	for <notmuch@notmuchmail.org>; Sat, 25 May 2013 04:19:04 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=google.com; s=20120113;
	h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references
	:x-gm-message-state;
	bh=HWZ2hz8RF4Y3jNGITcOBkNepgkttxmAMy8oyp1lFIWQ=;
	b=YvVa6/dA77Y/C5HdNfUBWG526EiEY2lnuktGwxCocyalv15mox94nQ15k4ivxBzn+q
	TORib5Oxh84V242/09/Dlz98/FxAA5wloR6LNaX+bPSEo4YNZDN5PGE+3x90qo1BLNGU
	0RVKDweckHgeiDYA7WC86RHK/cB7TVY02Av6JlSRNMy6dRhOtVFtDDejTl09m7G+Snn7
	Pdamgicr4kxt3Jx041A4YvL+xr77dN2rs13meCwiSkmeedM+C2GVHZmwpxZ60bNeaouh
	6R4j/tUSoF2fDAZigGVVpzm6kxxl210JIyGxC00WROIdoY0Gw3ZMkFCeoiIv05/OS4sD
	S+Hw==
X-Received: by 10.112.60.8 with SMTP id d8mr3504005lbr.39.1369480744050;
	Sat, 25 May 2013 04:19:04 -0700 (PDT)
Received: from localhost (dsl-hkibrasgw2-58c376-211.dhcp.inet.fi.
	[88.195.118.211])
	by mx.google.com with ESMTPSA id f9sm8088210lbf.4.2013.05.25.04.19.02
	for <multiple recipients>
	(version=TLSv1.2 cipher=RC4-SHA bits=128/128);
	Sat, 25 May 2013 04:19:03 -0700 (PDT)
From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org
Subject: [PATCH v2] build: fix out-of-tree builds
Date: Sat, 25 May 2013 14:18:58 +0300
Message-Id: <1369480738-16551-1-git-send-email-jani@nikula.org>
X-Mailer: git-send-email 1.7.10.4
In-Reply-To: <1368615519-25977-1-git-send-email-jani@nikula.org>
References: <1368615519-25977-1-git-send-email-jani@nikula.org>
X-Gm-Message-State:
 ALoCoQlA08hiJD25b8pCM2j6CP4sKZ6tfw+LvAQxWKh6B3z9fvnf/dS35oal1cEmRerZggDlqxSq
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, 25 May 2013 11:19:13 -0000

Support for out-of-tree builds was added in
commit 3e4a9d60a9419621b08c647a306843d76c47c2cb
Author: Carl Worth <cworth@cworth.org>
Date:   Wed Mar 9 15:02:42 2011 -0800

    build: Add support for non-source-directory builds.

and broken in
commit 7beeb8c88a014ecbc53d8241f10683b3c4c16228
Author: David Bremner <bremner@debian.org>
Date:   Sat Nov 17 12:28:15 2012 -0400

    test: initial performance testing infrastructure

Fix the build breakage.

Out-of-tree 'make test' has been broken since earlier than the above,
and remains broken, as does out-of-tree perf test, but at least the
build now works.

---

I didn't have the time to dig into the test and perf test breakage.
---
 Makefile                        |    7 ++++---
 performance-test/Makefile.local |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 73a8554..0428160 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,10 @@
 # given explicitly on the command line) so mention it first.
 all:
 
-# List all subdirectories here. Each contains its own Makefile.local
-subdirs := compat completion emacs lib man parse-time-string
-subdirs += performance-test util test
+# List all subdirectories here. Each contains its own Makefile.local.
+# Use of '=', without '+=', seems to be required for out-of-tree
+# builds to work.
+subdirs = compat completion emacs lib man parse-time-string performance-test util test
 
 # We make all targets depend on the Makefiles themselves.
 global_deps = Makefile Makefile.config Makefile.local \
diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
index 73aa963..e47219a 100644
--- a/performance-test/Makefile.local
+++ b/performance-test/Makefile.local
@@ -2,7 +2,7 @@
 
 dir := performance-test
 
-include $(dir)/version.sh
+include $(srcdir)/$(dir)/version.sh
 
 TIME_TEST_SCRIPT := ${dir}/notmuch-time-test
 MEMORY_TEST_SCRIPT := ${dir}/notmuch-memory-test
-- 
1.7.10.4