[PATCH 1/3] build system: remove directories created by tests in "make clean"

[david at tethera.net]

From: David Bremner <bremner at debian.org>

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