From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Sun, 4 Mar 2007 18:53:29 +0000 (+0000)
Subject: * test/Makefile.am: fixed test data copy problem in
X-Git-Tag: dbus-1.1.0~82
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d568118513d1475fa2e780e0c0ed8d48cace9f6;p=platform%2Fupstream%2Fdbus.git

* test/Makefile.am: fixed test data copy problem in
out of source build, when sources came from svn or cvs.
---

diff --git a/ChangeLog b/ChangeLog
index caade1b..7e9967b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-04  Ralf Habacker  <ralf.habacker@freenet.de>
+
+	* test/Makefile.am: fixed test data copy problem in 
+	out of source build, when sources came from svn or cvs. 
+
 2007-03-03  Ralf Habacker  <ralf.habacker@freenet.de>
 
 	* dbus/*-win.*,bus/*-win.*: added win32 platform related
diff --git a/test/Makefile.am b/test/Makefile.am
index 1416f82..ddb489d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -104,7 +104,7 @@ dist-hook:
 	for D in $(TESTDIRS); do						\
 		test -d $(distdir)/$$D || mkdir $(distdir)/$$D || exit 1 ;	\
 	done ;									\
-	FILES=`(cd $(srcdir) && $(FIND_TESTS) -o -name "*.in" -a -not -name Makefile.in)` ;					\
+	FILES=`(cd $(srcdir) && $(FIND_TESTS) -o -name "*.in" -a -not -name Makefile.in | grep -Ev "(.svn|CVS)" )` ;					\
         for F in $$FILES; do							\
                 echo '-- Disting file '$$F ;					\
 		cp -f $(srcdir)/$$F $(distdir)/$$F || exit 1 ;				\
@@ -117,7 +117,7 @@ all-local:
 		test -d $(top_builddir)/test/$$D || mkdir $(top_builddir)/test/$$D || exit 1 ;	\
 	done ;											\
 	if ! (test $(srcdir) = . || test $(srcdir) -ef .) ; then								\
-		FILES=`(cd $(srcdir) && $(FIND_TESTS))` ;					\
+		FILES=`(cd $(srcdir) && $(FIND_TESTS) | grep -Ev "(.svn|CVS)" )` ;					\
 	        for F in $$FILES; do								\
 			SRC=$(srcdir)/$$F ;							\
 			DEST=$(top_builddir)/test/$$F ;						\
@@ -135,7 +135,7 @@ all-local:
 ## this doesn't clean generated test data files when srcdir=builddir
 clean-local:
 	if test $(srcdir) != . ; then					\
-		FILES=`(cd $(top_builddir)/test && $(FIND_TESTS))` ;	\
+		FILES=`(cd $(top_builddir)/test && $(FIND_TESTS) | grep -Ev "(.svn|CVS)" )` ;	\
 	        for F in $$FILES; do					\
 			DEST=$(top_builddir)/test/$$F ;			\
 	                echo '-- Deleting test file '$$F ;		\