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

diff --git a/Makefile b/Makefile
index 73a8554..3301d30 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,7 @@
 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
+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.2.5