PR 11238

        * Makefile.tpl (local-distclean): Also remove config.cache files in
        sub-directories as there may not be Makefiles present in the
        sub-directories.
        * Makefile.in: Regenerate.
        * configure.ac: Revert previous delta.
        * configure: Regenerate.

5 files changed, 12 insertions, 34 deletions

diff --git a/ChangeLog b/ChangeLog
index 6aac96e9d56..d319b11676f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-17  Nick Clifton  <nickc@redhat.com>
+
+	PR 11238
+	* Makefile.tpl (local-distclean): Also remove config.cache files in
+	sub-directories as there may not be Makefiles present in the
+	sub-directories.
+	* Makefile.in: Regenerate.
+	* configure.ac: Revert previous delta.
+	* configure: Regenerate.
+
 2010-02-15  Nick Clifton  <nickc@redhat.com>
 
 	PR 11238
diff --git a/Makefile.in b/Makefile.in
index 8f9be0cbc67..c9ff0e5e33a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2658,6 +2658,7 @@ local-distclean:
 	-rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
 	-rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
 	-rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null
+	-find . -name config.cache -exec rm -f {} \; 2>/dev/null
 
 local-maintainer-clean:
 	@echo "This command is intended for maintainers to use;"
diff --git a/Makefile.tpl b/Makefile.tpl
index 889c040c5b2..37317bcaf88 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -771,6 +771,7 @@ local-distclean:
 	-rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null
 	-rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
 	-rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null
+	-find . -name config.cache -delete \; 2>/dev/null
 
 local-maintainer-clean:
 	@echo "This command is intended for maintainers to use;"
diff --git a/configure b/configure
index 1f58ba30b00..fd652987924 100755
--- a/configure
+++ b/configure
@@ -7606,12 +7606,6 @@ for module in ${build_configdirs} ; do
     echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure"
     rm -f ${build_subdir}/${module}/Makefile
   fi
-  # PR 11238: Also remove config.cache files.
-  if test -z "${no_recursion}" \
-     && test -f ${build_subdir}/${module}/config.cache; then
-    echo 1>&2 "*** removing ${build_subdir}/${module}/config.cache to allow reconfigure"
-    rm -f ${build_subdir}/${module}/config.cache
-  fi
   extrasub_build="$extrasub_build
 /^@if build-$module\$/d
 /^@endif build-$module\$/d
@@ -7627,11 +7621,6 @@ for module in ${configdirs} ; do
 	rm -f ${file}
       fi
     done
-    # PR 11238: Also remove config.cache files.
-    if test -f ${module}/config.cache; then
-      echo 1>&2 "*** removing ${module}/config.cache to allow reconfigure"
-      rm -f ${module}/config.cache
-    fi
   fi
   extrasub_host="$extrasub_host
 /^@if $module\$/d
@@ -7646,12 +7635,6 @@ for module in ${target_configdirs} ; do
     echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure"
     rm -f ${target_subdir}/${module}/Makefile
   fi
-  # PR 11238: Also remove config.cache files.
-  if test -z "${no_recursion}" \
-     && test -f ${target_subdir}/${module}/config.cache; then
-    echo 1>&2 "*** removing ${target_subdir}/${module}/config.cache to allow reconfigure"
-    rm -f ${target_subdir}/${module}/config.cache
-  fi
 
   # We only bootstrap target libraries listed in bootstrap_target_libs.
   case $bootstrap_target_libs in
diff --git a/configure.ac b/configure.ac
index 371b6e2bc5b..34641667339 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2710,12 +2710,6 @@ for module in ${build_configdirs} ; do
     echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure"
     rm -f ${build_subdir}/${module}/Makefile
   fi
-  # PR 11238: Also remove config.cache files.
-  if test -z "${no_recursion}" \
-     && test -f ${build_subdir}/${module}/config.cache; then
-    echo 1>&2 "*** removing ${build_subdir}/${module}/config.cache to allow reconfigure"
-    rm -f ${build_subdir}/${module}/config.cache
-  fi
   extrasub_build="$extrasub_build
 /^@if build-$module\$/d
 /^@endif build-$module\$/d
@@ -2731,11 +2725,6 @@ for module in ${configdirs} ; do
 	rm -f ${file}
       fi
     done
-    # PR 11238: Also remove config.cache files.
-    if test -f ${module}/config.cache; then
-      echo 1>&2 "*** removing ${module}/config.cache to allow reconfigure"
-      rm -f ${module}/config.cache
-    fi
   fi
   extrasub_host="$extrasub_host
 /^@if $module\$/d
@@ -2750,12 +2739,6 @@ for module in ${target_configdirs} ; do
     echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure"
     rm -f ${target_subdir}/${module}/Makefile
   fi
-  # PR 11238: Also remove config.cache files.
-  if test -z "${no_recursion}" \
-     && test -f ${target_subdir}/${module}/config.cache; then
-    echo 1>&2 "*** removing ${target_subdir}/${module}/config.cache to allow reconfigure"
-    rm -f ${target_subdir}/${module}/config.cache
-  fi
 
   # We only bootstrap target libraries listed in bootstrap_target_libs.
   case $bootstrap_target_libs in