Fix sed'iting of files with gdbtk stuff in them

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 9b23ec17e9ac5b30e7f9d8e2e57cfe3969957f51..2ce0ad8f7001640c2a764e9f34982de3799f6c41 100644 (file)
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -362,22 +362,29 @@ state.h
 
 Do-last:
 
-echo Catering to RMS by removing traces of \"gdbtk\"...
-
 # Don't try to clean directories here, as the 'mv' command will fail.
 # Also, grep fails on NFS mounted directories.
-if ( echo $* | grep keep\-gdbtk > /dev/null ) ; then
+if ( echo $* | grep lose\-gdbtk > /dev/null ) ; then
+       echo Catering to RMS by removing traces of \"gdbtk\"...
        for i in * ; do
                if test ! -d $i && (grep sanitize-gdbtk $i > /dev/null) ; then
-                       echo Keeping gdbtk stuff in $i
+                       echo Removing traces of \"gdbtk\" out of $i...
+                       cp $i new
+                       sed '/start\-sanitize\-gdbtk/,/end-\sanitize\-gdbtk/d' < $i > new
+                       if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+                               echo Caching $i in .Recover...
+                               mv $i .Recover
+                       fi
+                       mv new $i
                fi
        done
 else
+       echo Leaving \"gdbtk\" in the sources...
        for i in * ; do
                if test ! -d $i && (grep sanitize-gdbtk $i > /dev/null) ; then
-                       echo Removing traces of \"gdbtk\" out of $i...
+                       echo Keeping \"gdbtk\" stuff in $i, but editing out sanitize lines...
                        cp $i new
-                       sed '/start\-sanitize\-gdbtk/,/end-\sanitize\-gdbtk/d' < $i > new
+                       sed -e '/start\-sanitize\-gdbtk/d' -e '/end\-sanitize\-gdbtk/d' < $i > new
                        if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
                                echo Caching $i in .Recover...
                                mv $i .Recover