From: Bruno Haible Date: Mon, 14 Mar 2005 17:11:46 +0000 (+0000) Subject: Fix the dist target. X-Git-Tag: v0.14.3~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b0333d16ed4a6f2f36ebb5272b7037a61bb657a;p=thirdparty%2Fgettext.git Fix the dist target. --- diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 5552b6a72..eb191a284 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,7 +1,13 @@ -2005-03-08 Bruno Haible +2005-03-14 Bruno Haible * gettext-0.14.3 released. +2005-03-14 Bruno Haible + + * 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 * 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 0f5cbd1a0..fafae25b5 100644 --- 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