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.
This commit is contained in:
parent
dc7992f47e
commit
d4850f586d
10
ChangeLog
10
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
|
||||
|
|
|
@ -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;"
|
||||
|
|
|
@ -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;"
|
||||
|
|
|
@ -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
|
||||
|
|
17
configure.ac
17
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
|
||||
|
|
Loading…
Reference in New Issue