Strip beos markers.

diff --git a/.Sanitize b/.Sanitize
index 426cc4cd94ededfa4cc09f0b4f516d7c0e989c26..f41629979de68f68be3adb247396ded49fdc89f3 100644 (file)
--- a/.Sanitize
+++ b/.Sanitize
@@ -692,6 +692,34 @@ else
        done
 fi
 
+beos_files="ChangeLog config.guess configure.in"
+if ( echo $* | grep keep\-beos > /dev/null ) ; then
+       for i in $beos_files ; do
+               if test ! -d $i && (grep sanitize-beos $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Keeping beos stuff in $i
+                       fi
+               fi
+       done
+else
+       for i in * ; do
+               if test ! -d $i && (grep sanitize-beos $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Removing traces of \"beos\" from $i...
+                       fi
+                       cp $i new
+                       sed '/start\-sanitize\-beos/,/end-\sanitize\-beos/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
+
 kcygnus_files="ChangeLog configure configure.in Makefile.in"
 if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
        for i in $kcygnus_files ; do

diff --git a/bfd/.Sanitize b/bfd/.Sanitize
index 6981b150a3f8a9a6d2b737574dcc917f6ab13ebe..ca24fbe713b8c99a70de782561a7f34ff3653479 100644 (file)
--- a/bfd/.Sanitize
+++ b/bfd/.Sanitize
@@ -608,6 +608,34 @@ else
        done
 fi
 
+beos_files="ChangeLog config.bfd"
+if ( echo $* | grep keep\-beos > /dev/null ) ; then
+       for i in $beos_files ; do
+               if test ! -d $i && (grep sanitize-beos $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Keeping beos stuff in $i
+                       fi
+               fi
+       done
+else
+       for i in $beos_files ; do
+               if test ! -d $i && (grep sanitize-beos $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Removing traces of \"beos\" from $i...
+                       fi
+                       cp $i new
+                       sed '/start\-sanitize\-beos/,/end-\sanitize\-beos/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

diff --git a/gas/.Sanitize b/gas/.Sanitize
index 78d65a8188f34253a18868015c4974ec70363357..1ed138b924ea2bfdeea1e13c15c33d93d84bc01c 100644 (file)
--- a/gas/.Sanitize
+++ b/gas/.Sanitize
@@ -492,6 +492,34 @@ else
        done
 fi
 
+beos_files="ChangeLog configure.in configure"
+if ( echo $* | grep keep\-beos > /dev/null ) ; then
+       for i in $beos_files ; do
+               if test ! -d $i && (grep sanitize-beos $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Keeping beos stuff in $i
+                       fi
+               fi
+       done
+else
+       for i in $beos_files ; do
+               if test ! -d $i && (grep sanitize-beos $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Removing traces of \"beos\" from $i...
+                       fi
+                       cp $i new
+                       sed '/start\-sanitize\-beos/,/end-\sanitize\-beos/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

diff --git a/ld/.Sanitize b/ld/.Sanitize
index 374ed9e8f2d6417a7586189e0d70379f78485bff..12e3bfb15ba050002bb41b4c1e26d037a0fca2a5 100644 (file)
--- a/ld/.Sanitize
+++ b/ld/.Sanitize
@@ -293,6 +293,34 @@ else
        done
 fi
 
+beos_files="ChangeLog Makefile.am Makefile.in configure.tgt"
+if ( echo $* | grep keep\-beos > /dev/null ) ; then
+       for i in $beos_files ; do
+               if test ! -d $i && (grep sanitize-beos $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Keeping beos stuff in $i
+                       fi
+               fi
+       done
+else
+       for i in $beos_files ; do
+               if test ! -d $i && (grep sanitize-beos $i > /dev/null) ; then
+                       if [ -n "${verbose}" ] ; then
+                               echo Removing traces of \"beos\" from $i...
+                       fi
+                       cp $i new
+                       sed '/start\-sanitize\-beos/,/end-\sanitize\-beos/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