rework last patch

diff --git a/gas/.Sanitize b/gas/.Sanitize
index b3df6317881aa864facea959d07ab90826c69d6a..b90deefa3ccdcdebd5489bcf2228f7e5ca41bd44 100644 (file)
--- a/gas/.Sanitize
+++ b/gas/.Sanitize
@@ -22,6 +22,13 @@ for d in obsolete regress regress.m68k testscripts ; do
     fi
 done
 
+# Remember the current list of files in config.
+if test -d config; then
+  gas_config_files=`cd config; echo *`
+else
+  gas_config_files=
+fi
+
 # All files listed between the "Things-to-keep:" line and the
 # "Do-last:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
@@ -537,6 +544,22 @@ for lost in .. $lose_these_too; do
   fi
 done
 
+# Check each file we removed from gas/config, and make sure it is not
+# mentioned in Makefiles or configure files.
+for lost in .. $gas_config_files; do
+  if test $lost != ..; then
+    if test -f config/$lost; then
+      :
+    else
+      for i in Makefile.am Makefile.in configure.in configure; do
+        if fgrep $lost $i >/dev/null 2>&1; then
+          echo '***' File gas/config/$lost was sanitized out but is still mentioned in gas/$i 1>&2
+        fi
+      done
+    fi
+  fi
+done
+
 # This must come after all other sanitizations.  Re-sanitize the .pot
 # file.
 if [ -n "${verbose}" ]; then

diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize
index a2fd7a8da9e78bb8bb7872d68786e449b0b2133a..5d2c7f042696067a89dd86da530bb6420b3ae315 100644 (file)
--- a/gas/config/.Sanitize
+++ b/gas/config/.Sanitize
@@ -522,16 +522,4 @@ for i in * ; do
   fi
 done
 
-for lost in .. $lose_these_too; do
-  if test $lost != ..; then
-    for i in Makefile.am Makefile.in configure.in configure; do
-      if test -f ../$i; then
-        if fgrep $lost ../$i >/dev/null 2>&1; then
-          echo '***' File gas/config/$lost was sanitized out but is still mentioned in gas/$i 1>&2
-        fi
-      fi
-    done
-  fi
-done
-
 # eof