Don't copy the COPYING.* files into the enclosing package.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index c072c64eefca72cd7573a5a6e78085be28a202f2..1a7becbab3f487d5120d306dad3261b26d3f18ce 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,14 +1,20 @@
+2001-09-13  Bruno Haible  <haible@clisp.cons.org>
+
+       * gettext-0.10.40 released.
+
 2001-07-11  Ulrich Drepper  <drepper@redhat.com>
 
        * locale.alias: Use he language code for hebrew, not iw.
 
-2001-09-01  Bruno Haible  <haible@clisp.cons.org>
+2001-09-13  Bruno Haible  <haible@clisp.cons.org>
 
        * *.h, *.c, *.y, Makefile.in: Change copyright notice from GPL to LGPL.
        This is a reaction to a blackmail from the GNOME project which
        threatened to distribute an LGPLed clone of libintl.
        * COPYING.LIB-2, COPYING.LIB-2.1: New files.
-       * Makefile.in (DISTFILES.common): Add them.
+       * Makefile.in (DISTFILES.gettext): Add them.
+       (install-data): Install them.
+       (uninstall): Uninstall them.
 
 2001-07-24  Bruno Haible  <haible@clisp.cons.org>
 

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 71350d1522892779fb8b34c66ec0d027aed9c785..19ed4a7e0f544610f1db0a000bfa0b30e8fa050e 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -71,11 +71,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 = COPYING.LIB-2 COPYING.LIB-2.1 Makefile.in \
+DISTFILES.common = Makefile.in \
 config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
 DISTFILES.generated = plural.c
 DISTFILES.normal = VERSION
-DISTFILES.gettext = libintl.glibc
+DISTFILES.gettext = COPYING.LIB-2 COPYING.LIB-2.1 libintl.glibc
 DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c
 
 # Libtool's library version information for libintl.
@@ -185,7 +185,7 @@ install-data: all
          $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
          $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
          $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
-         dists="$(DISTFILES.common)"; \
+         dists="COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common)"; \
          for file in $$dists; do \
            $(INSTALL_DATA) $(srcdir)/$$file \
                            $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -244,7 +244,7 @@ uninstall:
          : ; \
        fi
        if test "$(PACKAGE)" = "gettext"; then \
-         for file in VERSION ChangeLog $(DISTFILES.common) $(DISTFILES.generated); do \
+         for file in VERSION ChangeLog COPYING.LIB-2 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
            rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
          done; \
        else \

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 84aa26980a37ea77b50b5a2357c7b62ebd5352ec..17f362f0abdb0bb9f2b84e67e4557124cb2d92c1 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,12 @@
+2001-09-13  Bruno Haible  <haible@clisp.cons.org>
+
+       * gettext-0.10.40 released.
+
+2001-09-13  Bruno Haible  <haible@clisp.cons.org>
+
+       * gettextize.in: Don't copy intl/COPYING*; these files may confuse
+       the user of the enclosing package.
+
 2001-07-24  Bruno Haible  <haible@clisp.cons.org>
 
        * gettext-0.10.39 released.

diff --git a/misc/gettextize.in b/misc/gettextize.in
index a28ac357bbbd1d80cbc720f28c1c1cf9626d79d5..25a04cdc4a59d850a50065b24f3e821a74fbb371 100644 (file)
--- a/misc/gettextize.in
+++ b/misc/gettextize.in
@@ -159,14 +159,16 @@ done
 # Copy files to intl/ subdirectory.
 cd intl
 for file in *; do
-  rm -f $srcdir/intl/$file
-  if test $file != plural.c; then
-    ($try_ln_s && ln -s $gettext_dir/intl/$file $srcdir/intl/$file && $echo "Symlinking file intl/$file") 2>/dev/null ||
-    { $echo "Copying file intl/$file"; cp $file $srcdir/intl/$file; }
-  else
-    # plural.c is a generated file; it must be copied and touched.
-    $echo "Copying file intl/$file"; cp $file $srcdir/intl/$file
-    sleep 2; touch $srcdir/intl/$file
+  if test $file != COPYING.LIB-2 && test $file != COPYING.LIB-2.1; then
+    rm -f $srcdir/intl/$file
+    if test $file != plural.c; then
+      ($try_ln_s && ln -s $gettext_dir/intl/$file $srcdir/intl/$file && $echo "Symlinking file intl/$file") 2>/dev/null ||
+      { $echo "Copying file intl/$file"; cp $file $srcdir/intl/$file; }
+    else
+      # plural.c is a generated file; it must be copied and touched.
+      $echo "Copying file intl/$file"; cp $file $srcdir/intl/$file
+      sleep 2; touch $srcdir/intl/$file
+    fi
   fi
 done