From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 15 Feb 2017 16:55:53 +0000 (+0000)
Subject: test: Delete directories like directories, not files
X-Git-Tag: dbus-1.11.10~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e80835bb0aa3e140a90f47800cddbb9a477dc8c1;p=thirdparty%2Fdbus.git

test: Delete directories like directories, not files

Directories can't usefully appear in CLEANFILES, we have to delete
them recursively in clean-local.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99828
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
---

diff --git a/test/Makefile.am b/test/Makefile.am
index df0ab362b..7c712fa24 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -580,6 +580,7 @@ clean-local:
 			rm -f "$${F%.in}"; \
 		done; \
 	fi
+	rm -fr ./XDG_RUNTIME_DIR ./installable
 
 imported_data = \
 	data/valid-config-files/session.conf \
@@ -589,8 +590,6 @@ imported_data = \
 noinst_DATA = $(imported_data)
 CLEANFILES += \
 	$(noinst_DATA) \
-	XDG_RUNTIME_DIR \
-	installable \
 	$(NULL)
 
 data/valid-config-files/session.conf: $(top_builddir)/bus/session.conf