From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 5 Jun 2012 12:27:23 +0000 (+0100)
Subject: Fix distcheck: remove potentially-read-only files from builddir
X-Git-Tag: dbus-1.6.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7db205d25d93f801b5f22dfb8afd059c3961ff4f;p=thirdparty%2Fdbus.git

Fix distcheck: remove potentially-read-only files from builddir

During distcheck, the srcdir is read-only. During "make all", cp may
preserve the read-only status of the file copied from the srcdir,
resulting in failure to overwrite it with an identical file during
"make check" (which depends on all-local).

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/test/Makefile.am b/test/Makefile.am
index 0418e5959..aa04792b4 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -294,6 +294,7 @@ all-local:
 	else \
 		for F in $(static_data); do \
 			$(MKDIR_P) $${F%/*}; \
+			rm -f $$F; \
 			cp $(srcdir)/$$F $$F; \
 		done; \
 	fi