From: Bruno Haible <bruno@clisp.org>
Date: Sun, 11 Nov 2018 12:48:51 +0000 (+0100)
Subject: Stop installing the intl/ subdir sources.
X-Git-Tag: v0.20~232
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26f257ee716d23e8203b5a8a57cf401bdb97da7f;p=thirdparty%2Fgettext.git

Stop installing the intl/ subdir sources.

* gettext-runtime/intl/Makefile.in (gettextsrcdir): Remove variable.
(DISTFILES.obsolete): Remove variable.
(install-data): Don't install nor remove anything.
(installdirs): Don't create $(gettextsrcdir).
* gettext-tools/misc/add-to-archive: Don't add the intl directory to the
archive.
* PACKAGING: Remove mention of $prefix/share/gettext/intl/ directory.
---

diff --git a/PACKAGING b/PACKAGING
index 64c44bcfe..dcb42be2d 100644
--- a/PACKAGING
+++ b/PACKAGING
@@ -106,7 +106,6 @@ following file list.
       $prefix/lib/gettext/*
       $prefix/share/locale/*/LC_MESSAGES/gettext-tools.mo
       $prefix/share/gettext/config.rpath
-      $prefix/share/gettext/intl/*
       $prefix/share/gettext/po/*
       $prefix/share/gettext/projects/*
       $prefix/share/gettext/gettext.h
diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index 17a69370d..9a320321c 100644
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -43,7 +43,6 @@ includedir = @includedir@
 datarootdir = @datarootdir@
 datadir = @datadir@
 localedir = @localedir@
-gettextsrcdir = $(datadir)/gettext/intl
 aliaspath = $(localedir)
 subdir = intl
 
@@ -211,11 +210,6 @@ $(HEADERS) $(SOURCES)
 DISTFILES.generated = plural.c
 DISTFILES.normal = VERSION
 DISTFILES.gettext = ChangeLog COPYING.LIB INSTALL.windows libintl.glibc
-DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
-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
 
 all: all-@USE_INCLUDED_LIBINTL@
 all-yes: libintl.$la libintl.h ref-add.sed ref-del.sed
@@ -451,27 +445,6 @@ install-exec: all
 	  : ; \
 	fi
 install-data: all
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-	  $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \
-	  dists="COPYING.LIB $(DISTFILES.common)"; \
-	  for file in $$dists; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  dists="$(DISTFILES.generated)"; \
-	  for file in $$dists; do \
-	    if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
-	    $(INSTALL_DATA) $$dir/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  dists="$(DISTFILES.obsolete)"; \
-	  for file in $$dists; do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
 
 install-strip: install
 
@@ -496,11 +469,6 @@ installdirs:
 	else \
 	  : ; \
 	fi
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
-	else \
-	  : ; \
-	fi
 
 # Define this as empty until I found a useful application.
 installcheck:
diff --git a/gettext-tools/misc/add-to-archive b/gettext-tools/misc/add-to-archive
index 6cb30010e..fab9dd44b 100755
--- a/gettext-tools/misc/add-to-archive
+++ b/gettext-tools/misc/add-to-archive
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2002, 2006, 2009-2010, 2015-2016 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2006, 2009-2010, 2018 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 #
 
 # Usage: add-to-archive /somewhere/gettext-0.xx.yy.tar.gz
-# Adds the infrastructure files for gettext version 0.xx.yy to the reposutory
+# Adds the infrastructure files for gettext version 0.xx.yy to the repository
 # in the archive.dir.tar file.
 
 if test $# != 1; then
@@ -62,14 +62,6 @@ work_archive=`pwd`/"$work_dir/archive"
        cp -p $file "$work_archive/$file" ;;
    esac
  done
- mkdir "$work_archive/intl"
- cd intl
- for file in *; do
-   if test $file != COPYING.LIB-2 && test $file != COPYING.LIB-2.0 && test $file != COPYING.LIB-2.1; then
-     cp -p $file "$work_archive/intl/$file"
-   fi
- done
- cd ..
  mkdir "$work_archive/po"
  cd po
  for file in *; do