merge from gcc

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 7a1b316712830d07658dc6ff0a290836780b6c46..c511c1ed2280c6245038b88d1f03a334ee229789 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-27  Alan Modra  <amodra@bigpond.net.au>
+
+       * Makefile.in (distclean): Delete config files.
+
 2006-09-13  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
        PR other/23541

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 6651de4a5c8dc65bd751db7bec2ae3a20376eabb..ca3814dc8512aee722f459ee156588c7f303d096 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -186,6 +186,7 @@ mostlyclean:
 clean: mostlyclean
 
 distclean: clean
+       rm -f config.status config.cache config.log config.intl config.h
        rm -f Makefile ID TAGS
 
 maintainer-clean: distclean
@@ -202,7 +203,7 @@ Makefile: $(srcdir)/Makefile.in config.status
 
 config.intl: $(srcdir)/config.intl.in config.status
        $(SHELL) ./config.status config.intl
-       
+
 config.status: $(srcdir)/configure
        $(SHELL) ./config.status --recheck
 
@@ -231,7 +232,6 @@ stamp-h1: $(srcdir)/config.h.in config.status
 $(srcdir)/config.h.in: @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/configure.ac
        cd $(srcdir) && $(AUTOHEADER)
        -rm -f stamp-h1
-       
 
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.