FYI ---------- Forwarded message ---------- From: Daiki Ueno <u...@gnu.org> Date: Mon, Jun 16, 2014 at 1:28 AM Subject: Re: [bug-gettext] gettext & ChangeLog To: Bruce Korb <bruce.k...@gmail.com> Cc: bug-gettext <bug-gett...@gnu.org>
Bruce Korb <bruce.k...@gmail.com> writes: > Anyway, once that worked, the gnulib stuff populates the "intl" directory > using gettext-provided scripts. Well and good, but the "make dist" chokes > and dies because some "ChangeLog" thingy is not found in the intl dir. Another silly mistake, sorry. I dropped the ChangeLog creation when migrating to git-version-gen, but forgot to adjust Makefiles. I've just pushed the attached fix. > For now, I just create a gibberish file on the fly. "Works for me." Yes, please use this as a workaround until 0.19.2. Thanks for reporting. Regards, -- Daiki Ueno
From ac9430edfd11fe8ad68705440805ea15979ed565 Mon Sep 17 00:00:00 2001 From: Daiki Ueno <u...@gnu.org> Date: Mon, 16 Jun 2014 16:48:33 +0900 Subject: [PATCH] intl: Stop installing ChangeLog.inst After the git-version-gen migration (commit fbf4e276), the creation of gettext-tools/intl/ChangeLog.inst in configure.ac was removed because we lost access to $RELEASE_DATE. Given that intl/VERSION provides enough information, simply drop the ChangeLog file. Problem reported by Bruce Korb in <https://lists.gnu.org/archive/html/bug-gettext/2014-06/msg00022.html>. * Makefile.in (install-data): Don't install ChangeLog.inst. (distclean): Don't remove ChangeLog.inst. (uninstall): Don't remove ChangeLog under $(gettextsrcdir)/intl. (dist): Don't include ChangeLog in the distribution. --- gettext-runtime/intl/ChangeLog | 15 +++++++++++++++ gettext-runtime/intl/Makefile.in | 10 ++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 1cca769..c131010 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,18 @@ +2014-06-16 Daiki Ueno <u...@gnu.org> + + intl: Stop installing ChangeLog.inst + After the git-version-gen migration (commit fbf4e276), the + creation of gettext-tools/intl/ChangeLog.inst in configure.ac was + removed because we lost access to $RELEASE_DATE. Given that + intl/VERSION provides enough information, simply drop the + ChangeLog file. + Problem reported by Bruce Korb in + <https://lists.gnu.org/archive/html/bug-gettext/2014-06/msg00022.html>. + * Makefile.in (install-data): Don't install ChangeLog.inst. + (distclean): Don't remove ChangeLog.inst. + (uninstall): Don't remove ChangeLog under $(gettextsrcdir)/intl. + (dist): Don't include ChangeLog in the distribution. + 2014-06-10 Daiki Ueno <u...@gnu.org> * gettext 0.19.1 released. diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in index 7151d39..4529551 100644 --- a/gettext-runtime/intl/Makefile.in +++ b/gettext-runtime/intl/Makefile.in @@ -460,7 +460,6 @@ install-data: all if test "$(PACKAGE)" = "gettext-tools"; then \ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ - $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \ dists="COPYING.LIB $(DISTFILES.common)"; \ for file in $$dists; do \ $(INSTALL_DATA) $(srcdir)/$$file \ @@ -571,7 +570,7 @@ uninstall: : ; \ fi if test "$(PACKAGE)" = "gettext-tools"; then \ - for file in VERSION ChangeLog COPYING.LIB $(DISTFILES.common) $(DISTFILES.generated); do \ + for file in VERSION COPYING.LIB $(DISTFILES.common) $(DISTFILES.generated); do \ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ done; \ else \ @@ -622,11 +621,6 @@ clean: mostlyclean distclean: clean rm -f Makefile ID TAGS - if test "$(PACKAGE)" = "gettext-runtime" || test "$(PACKAGE)" = "gettext-tools"; then \ - rm -f ChangeLog.inst $(DISTFILES.normal); \ - else \ - : ; \ - fi maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @@ -646,7 +640,7 @@ dist distdir: Makefile additional="$(DISTFILES.normal)"; \ fi; \ $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \ - for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \ + for file in $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \ if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ cp -p $$dir/$$file $(distdir) || test $$file = Makefile.in || exit 1; \ done; \ -- 1.9.3
