Return-Path: 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 6161F429E29 for ; Thu, 2 Aug 2012 06:22:59 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] 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 mTTN6j8h+7yc for ; Thu, 2 Aug 2012 06:22:58 -0700 (PDT) Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id A8D99431FDE for ; Thu, 2 Aug 2012 06:22:54 -0700 (PDT) Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net ([156.34.89.108] helo=zancas.localnet) by tesseract.cs.unb.ca with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1SwvMb-0003L6-Oj; Thu, 02 Aug 2012 10:22:53 -0300 Received: from bremner by zancas.localnet with local (Exim 4.80) (envelope-from ) id 1SwvMW-0006A4-At; Thu, 02 Aug 2012 10:22:48 -0300 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [PATCH 1/3] build system: remove directories created by tests in "make clean" Date: Thu, 2 Aug 2012 10:22:35 -0300 Message-Id: <1343913757-23472-2-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343913757-23472-1-git-send-email-david@tethera.net> References: <1343913757-23472-1-git-send-email-david@tethera.net> X-Spam_bar: - Cc: David Bremner X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Aug 2012 13:23:00 -0000 From: David Bremner These extra directories cause problems for building on Debian twice in a row. In order to remove directories, we need to us "rm -rf" instead of "rm -r". So now we should be extra careful what we add to the variable CLEAN. --- Makefile.local | 2 +- test/Makefile.local | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.local b/Makefile.local index 296995d..6d6896a 100644 --- a/Makefile.local +++ b/Makefile.local @@ -265,7 +265,7 @@ quiet ?= $($(shell echo $1 | sed -e s'/ .*//')) .PHONY : clean clean: - rm -f $(CLEAN); rm -rf .deps + rm -rf $(CLEAN); rm -rf .deps # We don't (yet) have any distributed files not in the upstream repository. # So distclean is currently identical to clean. diff --git a/test/Makefile.local b/test/Makefile.local index 4a6a4b1..c7f1435 100644 --- a/test/Makefile.local +++ b/test/Makefile.local @@ -31,4 +31,5 @@ check: test SRCS := $(SRCS) $(smtp_dummy_srcs) CLEAN := $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o \ $(dir)/symbol-test $(dir)/symbol-test.o \ - $(dir)/arg-test $(dir)/arg-test.o + $(dir)/arg-test $(dir)/arg-test.o \ + $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.* -- 1.7.10.4