Don't install the full ChangeLog in $(prefix)/share/gettext/intl, only a

short file.

diff --git a/Admin/plans b/Admin/plans
index c614afd1c3c06786e260b0b0af61035bfc3edede..3e1eff3d4efbc61c5b6b98864e048e0a9c27a66d 100644 (file)
--- a/Admin/plans
+++ b/Admin/plans
@@ -2,9 +2,6 @@ Things we plan to do. Comments welcome.
 
 - Respect the GNU standard targets in intl/Makefile.in and po/Makefile.in.in.
 
-- gettextize needs not copy intl/ChangeLog. Instead create an empty ChangeLog,
-  so that "make distcheck" will not fail.
-
 - Document bash-2.04's $"..." facility and the associated 2 environment
   variables.
 

diff --git a/ChangeLog b/ChangeLog
index 7be3772b9a0741c3b7571c9892520464552489ff..27dd1777fa86eada7725cd905f82c70cfb342213 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-09  Bruno Haible  <haible@clisp.cons.org>
+
+       * configure.in (RELEASE_DATE): New variable.
+       Create intl/ChangeLog.inst.
+
 2001-03-03  Bruno Haible  <haible@clisp.cons.org>
 
        * ltconfig:

diff --git a/configure.in b/configure.in
index 71e87856a9b2b720247541b5fc3d37c99582a9d8..b498f6525ef6654eeba76fad6b5a5d6e6b4031c4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.13)
-AC_REVISION($Revision: 1.13 $)
+AC_REVISION($Revision: 1.14 $)
 AC_INIT(src/msgfmt.c)
 AM_INIT_AUTOMAKE(gettext, 0.10.36)
+RELEASE_DATE=2001-03-09      dnl in "date +%Y-%m-%d" format
 AM_CONFIG_HEADER(config.h)
 
 dnl Set of available languages.
@@ -90,6 +91,12 @@ AC_SUBST(aclocaldir)
 dnl Generate the version information file in the intl/ directory.
 test -d intl || mkdir intl
 echo "GNU gettext library from $PACKAGE-$VERSION" > intl/VERSION
+cat > intl/ChangeLog.inst <<EOF
+$RELEASE_DATE  GNU  <bug-gnu-utils@gnu.org>
+
+       * Version $VERSION released.
+
+EOF
 
 AC_OUTPUT([Makefile lib/Makefile intl/Makefile src/Makefile \
            po/Makefile.in doc/Makefile tests/Makefile m4/Makefile \

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 6e36c9f75d15e42dc2bc708e591c4944672cd5b5..1d81311cc1a1f3b5f4c2547873028e028356bd37 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,13 @@
+2001-03-09  Bruno Haible  <haible@clisp.cons.org>
+
+       * Makefile.in (DISTFILES.common): Remove ChangeLog.
+       (DISTFILES.obsolete): New variable.
+       (install-data): Install ChangeLog.inst as ChangeLog. Remove the files
+       listed in DISTFILES.obsolete.
+       (uninstall): Simplify.
+       (distclean): Remove ChangeLog.inst.
+       (dist): Mention ChangeLog explicitly.
+
 2001-03-04  Bruno Haible  <haible@clisp.cons.org>
  
        * dcigettext.c (ISSLASH, HAS_DEVICE, IS_ABSOLUTE_PATH,

diff --git a/intl/Makefile.in b/intl/Makefile.in
index c28819aa351891ed7aca8cf73d839fba64138a92..7b1498def13a7a6b0c7f62a3d25fbf857a4c1fb5 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -70,10 +70,11 @@ finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
 explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \
 plural.$lo localcharset.$lo
 GETTOBJS = intl-compat.$lo
-DISTFILES.common = ChangeLog Makefile.in \
+DISTFILES.common = Makefile.in \
 config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
 DISTFILES.normal = VERSION
 DISTFILES.gettext = libintl.glibc plural.c
+DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c
 
 # Libtool's library version information for libintl.
 # Before making a gettext release, the gettext maintainer must change this
@@ -172,11 +173,16 @@ install-data: all
        if test "$(PACKAGE)" = "gettext"; then \
          $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
          $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
+         $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
          dists="$(DISTFILES.common)"; \
          for file in $$dists; do \
            $(INSTALL_DATA) $(srcdir)/$$file \
                            $(DESTDIR)$(gettextsrcdir)/$$file; \
          done; \
+         dists="$(DISTFILES.obsolete)"; \
+         for file in $$dists; do \
+           rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+         done; \
        else \
          : ; \
        fi
@@ -220,8 +226,7 @@ uninstall:
          : ; \
        fi
        if test "$(PACKAGE)" = "gettext"; then \
-         dists="$(DISTFILES.common)"; \
-         for file in VERSION $$dists; do \
+         for file in VERSION ChangeLog $(DISTFILES.common); do \
            rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
          done; \
        else \
@@ -255,7 +260,7 @@ clean: mostlyclean
 distclean: clean
        rm -f Makefile ID TAGS
        if test "$(PACKAGE)" = gettext; then \
-         rm -f $(DISTFILES.normal); \
+         rm -f ChangeLog.inst $(DISTFILES.normal); \
        else \
          : ; \
        fi
@@ -274,7 +279,7 @@ dist distdir: Makefile $(DISTFILES)
        else \
          additional="$(DISTFILES.normal)"; \
        fi; \
-       for file in $(DISTFILES.common) $$additional; do \
+       for file in ChangeLog $(DISTFILES.common) $$additional; do \
          ln $(srcdir)/$$file $(distdir) 2> /dev/null \
            || cp -p $(srcdir)/$$file $(distdir); \
        done