merge from gcc

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 8ccdb81c5993bd6beb92930da78e06ab6c8a8e4a..5a21c35b91754d1c2e1585ae69aadaa0e58f6922 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-23  Carlos O'Donell  <carlos@codesourcery.com>
+
+       * Makefile.in: Add info dvi ps pdf html install-html to .PHONY
+       Add install-html target.
+
 2005-05-13  Nick Clifton  <nickc@redhat.com>
 
        * Update the address and phone number of the FSF organization in

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 77dc1542f4bea4c4ddad650e710d2110ec45e058..93ba8fc726da1d71417b6614c400cd59db6d5d94 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -148,7 +148,10 @@ installdirs:
 installcheck:
 uninstall:
 
+.PHONY: info dvi ps pdf html install-html
+
 info dvi ps pdf html:
+install-html:
 
 $(OBJECTS): config.h libintl.h
 bindtextdom.o dcgettext.o dcigettext.o dcngettext.o dgettext.o \