X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=.Sanitize;h=016d6b2207c5e78fabc8ff1e87867c4c9c47f554;hb=0ee3427297272a636e7ef8378182a38d64ed7b7d;hp=13cec5ed9cfd4e81cc6f0e35665f35917a5e62e5;hpb=5357f1287d574310c08a9e54e8b903f9571d4129;p=deliverable%2Fbinutils-gdb.git

diff --git a/.Sanitize b/.Sanitize
index 13cec5ed9c..016d6b2207 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
@@ -83,6 +85,7 @@ mmalloc
 move-if-change
 newlib
 opcodes
+pagas
 patch
 prms
 rcs
@@ -97,13 +100,13 @@ tk
 test-build.mk
 texinfo
 tgas
+utils
 uudecode
 wdiff
 xiberty
 
 Things-to-lose:
 
-
 # The lines between the "Do-last:" line and the end of the file
 # are executed as a /bin/sh shell script after everything else is
 # done.
@@ -116,6 +119,17 @@ else
 	verbose=
 fi
 
+# Remove "sanitize-Sanitize" lines.
+if [ -n "${verbose}" ] ; then
+	echo Cleaning unconditional sanitizations out of Makefile.in...
+fi
+cp Makefile.in new
+sed '/start\-sanitize\-Sanitize/,/end-\sanitize\-Sanitize/d' < Makefile.in > new
+if [ -n "${safe}" -a ! -f .Recover/Makefile.in ] ; then
+	mv Makefile.in .Recover
+fi
+mv new Makefile.in
+
 if [ -n "${verbose}" ] ; then
 	echo Looking for signs of \"v9\"...
 fi
@@ -179,30 +193,37 @@ else
 	done
 fi
 
-if ( echo $* | grep for\-fsf > /dev/null ) ; then
-	if [ -n "${verbose}" ]; then
-		echo Cleaning up configure.in for FSF release...
-	fi
-	sed '/start\-sanitize\-for\-fsf/,/end\-sanitize\-for\-fsf/d' < configure.in > new
-	if [ -n "${safe}" -a ! -f .Recover/$i ]; then
-		if [ -n "${verbose}" ]; then
-			echo Caching configure.in in .Recover...
+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
-		mv configure.in .Recover
-	fi
-	mv new configure.in
+	done
 else
-	if [ -n "${verbose}" ]; then
-		echo Removing sanitize-for-fsf markers from configure.in...
-	fi
-	grep -v sanitize-for-fsf < configure.in > new
-	if [ -n "${safe}" ]; then
-		if [ -n "${verbose}" ]; then
-			echo Caching configure.in in .Recover...
+	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
-		mv configure.in .Recover
-	fi
-	mv new configure.in
+	done
 fi
 
 for i in * ; do