[PATCH 1/3] build: don't overwrite DISTCLEAN in performance-test

diff --git a/ee/923d21741dad798bd0601497c747c36eecc821 b/ee/923d21741dad798bd0601497c747c36eecc821
new file mode 100644 (file)
index 0000000..543b3b0
--- /dev/null
+++ b/ee/923d21741dad798bd0601497c747c36eecc821
@@ -0,0 +1,65 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\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 C196D431E64\r
+       for <notmuch@notmuchmail.org>; Sat,  3 May 2014 23:12:03 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 jFMeRQpXKTMY for <notmuch@notmuchmail.org>;\r
+       Sat,  3 May 2014 23:11:59 -0700 (PDT)\r
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net\r
+       [87.98.215.224]) (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E6124431FDB\r
+       for <notmuch@notmuchmail.org>; Sat,  3 May 2014 23:11:58 -0700 (PDT)\r
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim\r
+       4.72) (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1Wgpds-0005h2-G1; Sun, 04 May 2014 06:11:16 +0000\r
+Received: (nullmailer pid 25072 invoked by uid 1000); Sun, 04 May 2014\r
+       06:10:57 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/3] build: don't overwrite DISTCLEAN in performance-test\r
+Date: Sun,  4 May 2014 15:10:47 +0900\r
+Message-Id: <1399183849-25032-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.9.2\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: Sun, 04 May 2014 06:12:03 -0000\r
+\r
+This might have worked once for some fixed order of including\r
+makefiles, but it is clearly wrong now.\r
+---\r
+ performance-test/Makefile.local | 2 +-\r
+ 1 file changed, 1 insertion(+), 1 deletion(-)\r
+\r
+diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local\r
+index d97e56d..cbea2d3 100644\r
+--- a/performance-test/Makefile.local\r
++++ b/performance-test/Makefile.local\r
+@@ -40,4 +40,4 @@ download-corpus:\r
+       wget -O ${TXZFILE} ${DEFAULT_URL}\r
+ \r
+ CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/log.*\r
+-DISTCLEAN := $(dir)/corpus $(dir)/notmuch.cache.*\r
++DISTCLEAN := $(DISTCLEAN) $(dir)/corpus $(dir)/notmuch.cache.*\r
+-- \r
+1.9.2\r
+\r