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

diff --git a/c4/ee0cb49069b2811556725e6190f856acf93573 b/c4/ee0cb49069b2811556725e6190f856acf93573
new file mode 100644 (file)
index 0000000..be6c217
--- /dev/null
+++ b/c4/ee0cb49069b2811556725e6190f856acf93573
@@ -0,0 +1,102 @@
+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 BA68B431FAF\r
+       for <notmuch@notmuchmail.org>; Thu,  7 Mar 2013 22:26:40 -0800 (PST)\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 hrUtGpE0d6JG for <notmuch@notmuchmail.org>;\r
+       Thu,  7 Mar 2013 22:26:40 -0800 (PST)\r
+Received: from mail-la0-f47.google.com (mail-la0-f47.google.com\r
+       [209.85.215.47]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E3C97431FAE\r
+       for <notmuch@notmuchmail.org>; Thu,  7 Mar 2013 22:26:39 -0800 (PST)\r
+Received: by mail-la0-f47.google.com with SMTP id fj20so1326420lab.20\r
+       for <notmuch@notmuchmail.org>; Thu, 07 Mar 2013 22:26:38 -0800 (PST)\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:subject:in-reply-to:references:user-agent:date\r
+       :message-id:mime-version:content-type:x-gm-message-state;\r
+       bh=GCARrx0a/jcuFuXkWouRbMpI5WJoS9tjagdDQB7Bgu0=;\r
+       b=RUFdCI4KkK2hB/adUjyTneDcfPgYJrvHoMJSR3ivuHj+88CdymVQZDJp0ZYiRlmqcM\r
+       Z5xF0+BkOla5HrWFG7BxqxrUxZINL/Tj2+ZMt9/J4U/cW7e/6KbrXkptplwHa1y1M0Dx\r
+       beNFL25KSW+3uw9/win1C9pfbCh3pCrC4r5qgxkQ6rMM3YIHc7J9NDOMBstjkjHLSGjB\r
+       Iv4FsImfufzdegfROdiccRW8b18YfylIo9MZC8AGOdFxJ/Qcv6YdGDmsGrSB5QZwUnZW\r
+       NXd9uWp4T5bK3rluW4IJE48CDhQyNcXlJ7VU835jQ0bcdC2e3lUaT0qyHpm17/z7Ms+j\r
+       WM2g==\r
+X-Received: by 10.112.9.104 with SMTP id y8mr563285lba.132.1362723996856;\r
+       Thu, 07 Mar 2013 22:26:36 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.\r
+       [80.223.81.27])\r
+       by mx.google.com with ESMTPS id mq7sm1966866lab.1.2013.03.07.22.26.34\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Thu, 07 Mar 2013 22:26:35 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] build: fix out-of-tree builds\r
+In-Reply-To: <87txombkra.fsf@zancas.localnet>\r
+References: <1362692068-30142-1-git-send-email-jani@nikula.org>\r
+       <87txombkra.fsf@zancas.localnet>\r
+User-Agent: Notmuch/0.15.2+45~g53c33be (http://notmuchmail.org) Emacs/24.2.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Fri, 08 Mar 2013 08:26:33 +0200\r
+Message-ID: <877glimmp2.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-Gm-Message-State:\r
+ ALoCoQljFxHsQCYqhfrCvQVwiYUqDZGTuwjFUUve5sDtxaiCkIBeSpB+8WKuIiXw0KnwD2At3suy\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: Fri, 08 Mar 2013 06:26:40 -0000\r
+\r
+On Fri, 08 Mar 2013, David Bremner <david@tethera.net> wrote:\r
+> Jani Nikula <jani@nikula.org> writes:\r
+>> ---\r
+>>\r
+>> David, does the perf test still work for you with these changes?\r
+>\r
+>  make perf-test OPTIONS=--medium\r
+>\r
+> runs the time tests, but then fails with\r
+>\r
+> ./performance-test/notmuch-memory-test --medium\r
+> make[1]: ./performance-test/notmuch-memory-test: Command not found\r
+> make[1]: *** [memory-test] Error 127\r
+> make[1]: Leaving directory `/home/bremner/software/upstream/notmuch'\r
+> make: *** [perf-test] Error 2\r
+>\r
+> To be honest, the line \r
+>\r
+> TIME_TEST_SCRIPT :=$ $(srcdir)/$(dir)/notmuch-time-test\r
+>\r
+> looks pretty strange to me, but that seems to be the one that is working\r
+\r
+Oof, to be honest, that was a typo. The minimal change required to\r
+*build* is:\r
+\r
+-include $(dir)/version.sh\r
++include $(srcdir)/$(dir)/version.sh\r
+\r
+and the rest was just a poor attempt at making perf test work too. I'll\r
+look into it.\r
+\r
+Jani.\r
+\r