Remove references to non-existing COPYING.LIB-2.*.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 0fa70d93397a905e3c0bcd91b845c4e457071153..c3786a73b27372329b08d9213194205e564fe1c4 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,13 @@
+2013-01-21  Daiki Ueno  <ueno@gnu.org>
+
+       Remove references to non-existing COPYING.LIB-2.*.
+       Reported by Christian Weisgerber <naddy@mips.inka.de>.
+       * Makefile.in (DISTFILES.obsolete): Add COPYING.LIB-2.*.
+       (install-data): Install COPYING.LIB instead of no longer existing
+       COPYING.LIB-2.*.
+       (uninstall): Remove COPYING.LIB instead of no longer existing
+       COPYING.LIB-2.*.
+
 2013-01-17  Daiki Ueno  <ueno@gnu.org>
 
        Fix link errors related to C99-style extern inline.

diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index 449fdb1ef29737c886ad4c60d4d7b98bf49deba1..0f3f46cf10982561c8cb6c7035ed9e3442ca631b 100644 (file)
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -203,7 +203,8 @@ DISTFILES.generated = plural.c
 DISTFILES.normal = VERSION
 DISTFILES.gettext = COPYING.LIB libintl.glibc README.woe32
 DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
-COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h \
+COPYING.LIB-2 COPYING.LIB-2.0 COPYING.LIB-2.1 \
+gettext.h libgettext.h plural-eval.c libgnuintl.h \
 libgnuintl.h_vms Makefile.vms libgnuintl.h.msvc-static \
 libgnuintl.h.msvc-shared Makefile.msvc
 
@@ -460,7 +461,7 @@ install-data: all
          $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
          $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
          $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \
-         dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \
+         dists="COPYING.LIB $(DISTFILES.common)"; \
          for file in $$dists; do \
            $(INSTALL_DATA) $(srcdir)/$$file \
                            $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -570,7 +571,7 @@ uninstall:
          : ; \
        fi
        if test "$(PACKAGE)" = "gettext-tools"; then \
-         for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \
+         for file in VERSION ChangeLog COPYING.LIB $(DISTFILES.common) $(DISTFILES.generated); do \
            rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
          done; \
        else \