From: Jani Taskinen <jani@php.net>
Date: Thu, 16 Jul 2009 12:10:38 +0000 (+0000)
Subject: - Fix the cleanup routine (it is not very nice to delete everything..)
X-Git-Tag: php-5.4.0alpha1~191^2~3098
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae3433a77f6dd81eb396371cfd8984ca4bcb6134;p=php

- Fix the cleanup routine (it is not very nice to delete everything..)
---

diff --git a/build/build.mk b/build/build.mk
index 38915accbe..ed5d53500e 100644
--- a/build/build.mk
+++ b/build/build.mk
@@ -71,8 +71,8 @@ cvsclean-work:
 	done
 
 svnclean-work:
-	@for i in `find . -type d -and -not -path '*/.svn/*'`; do \
-		(cd `dirname $$i` 2>/dev/null && svn propget svn:ignore $$i | xargs rm -rf && rm -rf *.o *.a .libs || true);	\
+	@for i in `find . -type d -not -path '*/.svn/*' | grep -v '.svn'`; do \
+		(cd `dirname $$i` 2>/dev/null && rm -rf `svn propget svn:ignore . | grep -v config.nice` *.o *.a .libs || true); \
 	done
 
 gitclean-work:
diff --git a/build/buildcheck.sh b/build/buildcheck.sh
index 25dcbe91e1..3b893acbb6 100755
--- a/build/buildcheck.sh
+++ b/build/buildcheck.sh
@@ -48,9 +48,9 @@ fi
 
 if test "$1" = "2" && test "$2" -ge "50"; then
   echo "buildconf: Your version of autoconf likely contains buggy cache code."
-  echo "           Running svnclean for you."
+  echo "           Running vcsclean for you."
   echo "           To avoid this, install autoconf-2.13."
-  ./svnclean
+  ./vcsclean
   stamp=
 fi