Fix the dist target.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 5552b6a7261db594a44ed8b77c20672e571a2052..eb191a284019819c4f8a923458139a3052568494 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,7 +1,13 @@
-2005-03-08  Bruno Haible  <bruno@clisp.org>
+2005-03-14  Bruno Haible  <bruno@clisp.org>
 
        * gettext-0.14.3 released.
 
+2005-03-14  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.in (dist, distdir): Ignore a failure to copy Makefile.in.
+       Needed because the automake-1.9 generated dist rule of the parent
+       directory already copies this file.
+
 2005-03-08  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.in (LTV_CURRENT, LTV_REVISION, LTV_AGE): Bump to 7:2:4.

diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index 0f5cbd1a026e72514d543cc74fdfc874fb975e4f..fafae25b55180c48987560a689d36269b1fbebb0 100644 (file)
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -485,7 +485,7 @@ dist distdir: Makefile
          $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \
          for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \
            if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-           cp -p $$dir/$$file $(distdir) || exit 1; \
+           cp -p $$dir/$$file $(distdir) || test $$file = Makefile.in || exit 1; \
          done; \
        fi