From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 5 Aug 2011 12:16:47 +0000 (+0100)
Subject: Make "make -C test clean" idempotent
X-Git-Tag: dbus-1.4.16~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14ed371845c50aa8fe5849c373ca2c65e96ec153;p=thirdparty%2Fdbus.git

Make "make -C test clean" idempotent

Previously, it'd fail when done twice, because you can't rmdir a
nonexistent directory.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40004
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
---

diff --git a/test/Makefile.am b/test/Makefile.am
index e5fd756bc..747445590 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -272,6 +272,8 @@ clean-local:
 			REVERSEDIRS="$$D $$REVERSEDIRS" ;		\
 		done ;							\
 		for D in $$REVERSEDIRS; do				\
-			rmdir $(top_builddir)/test/$$D || exit 1 ;	\
+			rmdir $(top_builddir)/test/$$D || 		\
+				test ! -d $(top_builddir)/test/$$D ||	\
+				exit 1 ;	\
 		done ;							\
 	fi