Move locale.alias to intl/, and install it.

diff --git a/Admin/plans b/Admin/plans
index eb63be262d925761e891bc95e2480d3004fea13d..fd891267ed87f577c9273bf41b8b0d660aabb65c 100644 (file)
--- a/Admin/plans
+++ b/Admin/plans
@@ -59,9 +59,6 @@ Things we plan to do. Comments welcome.
 
 - Change bug report address to bug-gettext instead of bug-gnu-utils@gnu.org
 
-- install locale.alias from intl/, using a refcount mechanism like for
-  charset.alias
-
 - Split xgettext into a language dependent part and a language independent
   part.
 

diff --git a/intl/ChangeLog b/intl/ChangeLog
index 697855d9014f424f99e99093196eb9703dac8ae5..2139ef64c5b667234c15fff990efab9d14860375 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-30  Bruno Haible  <haible@clisp.cons.org>
+
+       * locale.alias: New file, moved here from ../misc/locale.alias. Add
+       "Packages using this file" line.
+       * Makefile.in (DISTFILES.common): Add locale.alias.
+       (install-exec, uninstall): Install/deinstall locale.alias.
+
 2000-10-30  Ulrich Drepper  <drepper@redhat.com>
 
        * dcigettext.c (guess_category_value): For libc always use the

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 7fe3e22511155388d4934a82d46dc3ee5de0f08e..f84c719949088072bf9a7887ce8c060f612215f7 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -72,7 +72,7 @@ plural.$lo localcharset.$lo
 CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo
 GETTOBJS = intl-compat.$lo
 DISTFILES.common = ChangeLog Makefile.in po2msg.sin po2tbl.sin \
-config.charset ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
+config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES)
 DISTFILES.normal = VERSION
 DISTFILES.gettext = libintl.glibc intlh.inst.in plural.c
 
@@ -150,6 +150,15 @@ install-exec: all
          sed -f ref-add.sed $$orig > $$temp; \
          $(INSTALL_DATA) $$temp $$dest; \
          rm -f $$temp; \
+         $(mkinstalldirs) $(DESTDIR)$(localedir); \
+         test -f $(DESTDIR)$(localedir)/locale.alias \
+           && orig=$(DESTDIR)$(localedir)/locale.alias \
+           || orig=$(srcdir)/locale.alias; \
+         temp=$(DESTDIR)$(localedir)/t-locale.alias; \
+         dest=$(DESTDIR)$(localedir)/locale.alias; \
+         sed -f ref-add.sed $$orig > $$temp; \
+         $(INSTALL_DATA) $$temp $$dest; \
+         rm -f $$temp; \
        else \
          : ; \
        fi
@@ -177,17 +186,29 @@ uninstall:
        else \
          : ; \
        fi
-       if test '@USE_INCLUDED_LIBINTL@' = yes \
-         && test -f $(DESTDIR)$(libdir)/charset.alias; then \
-         temp=$(DESTDIR)$(libdir)/t-charset.alias; \
-         dest=$(DESTDIR)$(libdir)/charset.alias; \
-         sed -f ref-del.sed $$dest > $$temp; \
-         if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
-           rm -f $$dest; \
-         else \
-           $(INSTALL_DATA) $$temp $$dest; \
+       if test '@USE_INCLUDED_LIBINTL@' = yes; then \
+         if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+           temp=$(DESTDIR)$(libdir)/t-charset.alias; \
+           dest=$(DESTDIR)$(libdir)/charset.alias; \
+           sed -f ref-del.sed $$dest > $$temp; \
+           if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
+             rm -f $$dest; \
+           else \
+             $(INSTALL_DATA) $$temp $$dest; \
+           fi; \
+           rm -f $$temp; \
+         fi; \
+         if test -f $(DESTDIR)$(localedir)/locale.alias; then \
+           temp=$(DESTDIR)$(localedir)/t-locale.alias; \
+           dest=$(DESTDIR)$(localedir)/locale.alias; \
+           sed -f ref-del.sed $$dest > $$temp; \
+           if grep '^# Packages using this file: $$' $$temp > /dev/null; then \
+             rm -f $$dest; \
+           else \
+             $(INSTALL_DATA) $$temp $$dest; \
+           fi; \
+           rm -f $$temp; \
          fi; \
-         rm -f $$temp; \
        else \
          : ; \
        fi

diff --git a/misc/locale.alias b/intl/locale.alias
similarity index 98%
rename from misc/locale.alias
rename to intl/locale.alias
index d6fa49636fea06383fdd48b69d2fcf0ab4728034..927a10cf6dfcfd7863e4a6b01c72a489e185fdc9 100644 (file)
--- a/misc/locale.alias
+++ b/intl/locale.alias
@@ -26,6 +26,8 @@
 # it with the rest of us.  Send it using the `glibcbug' script to
 # bugs@gnu.org.
 
+# Packages using this file: 
+
 bokmal         nb_NO.ISO-8859-1
 bokmål         nb_NO.ISO-8859-1
 catalan                ca_ES.ISO-8859-1

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 8569f56f9c98d0ed9246c535591b9a47aa670468..7731c0d1cdace1fb14a399f0737c5920ea182333 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-30  Bruno Haible  <haible@clisp.cons.org>
+
+       * locale.alias: Move to ../intl.
+       * Makefile.am (EXTRA_DIST): Remove locale.alias.
+       (localedir, locale_DATA): Remove variables.
+
 2000-12-08  Bruno Haible  <haible@clisp.cons.org>
 
        * gettextize.in: Preserve RCS and CVS subdirs in intl/.

diff --git a/misc/Makefile.am b/misc/Makefile.am
index aaf822dca45230615d497f09ca3b07137ee0c74e..05f9ddd7014c08197571a418ff8cde0fb24a2d59 100644 (file)
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the misc subdirectory of the GNU NLS Utilities
-## Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+## Copyright (C) 1995, 1996, 1997, 2000 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
@@ -19,13 +19,9 @@
 
 AUTOMAKE_OPTIONS = 1.2 gnits
 
-localedir = $(datadir)/locale
-
 EXTRA_DIST = combine-sh gettext.perl gettext-sh magic.add tcl_gettext.c \
-README-Tcl po-mode.el locale.alias
+README-Tcl po-mode.el
 DISTCLEANFILES = gettextize
 lisp_LISP = po-mode.el
 
 bin_SCRIPTS = gettextize
-
-locale_DATA = locale.alias