diff --git a/.Sanitize b/.Sanitize index 7b7c036ca8..df20f70e78 100644 --- a/.Sanitize +++ b/.Sanitize @@ -109,30 +109,6 @@ else done fi -echo Looking for signs of \"life\"... - -# Don't try to clean directories here, as the 'mv' command will fail. -# Also, grep fails on NFS mounted directories. -if ( echo $* | grep keep\-life > /dev/null ) ; then - for i in * ; do - if test ! -d $i && (grep sanitize-life $i > /dev/null) ; then - echo Keeping life alive in $i - fi - done -else - for i in * ; do - if test ! -d $i && (grep sanitize-life $i > /dev/null) ; then - echo Beating the \"life\" out of $i... - cp $i new - sed '/start\-sanitize\-life/,/end-\sanitize\-life/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - 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! diff --git a/config.sub b/config.sub index 7639514211..3d0aa791a8 100755 --- a/config.sub +++ b/config.sub @@ -125,14 +125,6 @@ case $basic_machine in ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. -# start-sanitize-life - life-*) ;; - life) - basic_machine=life-philips - os=-none - ;; -# end-sanitize-life - # start-sanitize-v9 sparc64-*) ;; hal-32 | hal32) @@ -378,7 +370,7 @@ case $basic_machine in os=-newsos ;; st2000) - basic_machine=m68kmote-tandem + basic_machine=m68k-tandem ;; decstation-dec | decstation | decstation-3100 | pmax | pmin | dec3100 | decstatn) basic_machine=mips-dec