X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=.Sanitize;h=c51ba683c134320040c4d0bf302006a821b8ecf7;hb=5db7ecb785deaf2f6b4c0a830147d0927e078531;hp=dfadb7fda41d6a01d808d62ecde58f5883f6c44a;hpb=4a01dc52940954b75b15369a4afb0af0b19837db;p=deliverable%2Fbinutils-gdb.git

diff --git a/.Sanitize b/.Sanitize
index dfadb7fda4..c51ba683c1 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -1,6 +1,6 @@
 # .Sanitize for devo.
 
-# Each directory to survive it's way into a release will need a file
+# Each directory to survive its way into a release will need a file
 # like this one called "./.Sanitize".  All keyword lines must exist,
 # and must exist in the order specified by this file.  Each directory
 # in the tree will be processed, top down, in the following order.
@@ -15,14 +15,17 @@
 
 Do-first:
 
-if ( echo $* | grep keep\-chill > /dev/null ) ; then
-	keep_these_too="chillrt test-chill"
-fi
-
 if ( echo $* | grep keep\-cygnus > /dev/null) ; then
-	keep_these_too="${keep_these_too} release release-info"
+	keep_these_too="${keep_these_too} release release-info build-all.mk"
+else
+	lose_these_too="${lose_these_too} release release-info build-all.mk"
 fi
 
+if ( echo $* | grep keep\-mpw > /dev/null) ; then
+	keep_these_too="mpw-configure mpw-config.in mpw-build.in ChangeLog.mpw ${keep_these_too}"
+else
+	lose_these_too="mpw-configure mpw-config.in mpw-build.in ChangeLog.mpw ${lose_these_too}"
+fi
 
 # All files listed between the "Things-to-keep:" line and the
 # "Do-last:" line will be kept.  All other files will be removed.
@@ -42,7 +45,6 @@ README
 autoconf
 bfd
 binutils
-build-all.mk
 byacc
 config
 config.guess
@@ -76,12 +78,14 @@ ld
 libg++
 libgcc
 libiberty
+libio
 m4
 make
 mmalloc
 move-if-change
 newlib
 opcodes
+pagas
 patch
 prms
 rcs
@@ -96,6 +100,7 @@ tk
 test-build.mk
 texinfo
 tgas
+utils
 uudecode
 wdiff
 xiberty
@@ -177,6 +182,39 @@ else
 	done
 fi
 
+if [ -n "${verbose}" ] ; then
+	echo Removing traces of \"mpw\"...
+fi
+
+# Don't try to clean directories here, as the 'mv' command will fail.
+# Also, grep fails on NFS mounted directories.
+if ( echo $* | grep keep\-mpw > /dev/null ) ; then
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-mpw $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping mpw stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-mpw $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"mpw\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-mpw/,/end-\sanitize\-mpw/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
 for i in * ; do
 	if test ! -d $i && (grep sanitize $i > /dev/null) ; then
 		echo '***' Some mentions of Sanitize are still left in $i! 1>&2