Support packages which need extra locale categories.

diff --git a/po/ChangeLog b/po/ChangeLog
index 06595ff9de92a0f25c7395ea8ee13df6357835b4..13a8e6e7e9af41328961f4ccf555033fff48f884 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,12 @@
+2002-01-16  Bruno Haible  <bruno@clisp.org>
+
+       * Makevars (EXTRA_LOCALE_CATEGORIES): New variable.
+       * Makefile.in.in (install-data-yes): For each EXTRA_LOCALE_CATEGORIES,
+       install a symlink to the catalog in the LC_MESSAGES subdirectory.
+       (installdirs-data-yes): Keep consistent with install-data-yes.
+       (uninstall-data-yes): Adjust for EXTRA_LOCALE_CATEGORIES.
+       (installdirs-data): Fix dependency.
+
 2002-01-15  Bruno Haible  <bruno@clisp.org>
 
        * de.po: Update from Karl Eichwalder <ke@suse.de>.

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index fb7265ab02516b38db3eede77dcf3a4f8f86ebab..166c169c5172dcda6c3a504e247e144cf1f90559 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,5 +1,5 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000-2002 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file can be copied and used freely without restrictions.  It can
 # be used in projects which are not available under the GNU General Public
@@ -116,21 +116,42 @@ install-data-yes: all
          lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
          dir=$(localedir)/$$lang/LC_MESSAGES; \
          $(mkinstalldirs) $(DESTDIR)$$dir; \
-         if test -r $$cat; then \
-           $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(DOMAIN).mo; \
-           echo "installing $$cat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
-         else \
-           $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(DOMAIN).mo; \
-           echo "installing $(srcdir)/$$cat as" \
-                "$(DESTDIR)$$dir/$(DOMAIN).mo"; \
-         fi; \
+         if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+         $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+         echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+         for lc in $(EXTRA_LOCALE_CATEGORIES); do \
+           if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+             link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+             mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+             mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+             (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+              for file in *; do \
+                if test -f $$file; then \
+                  ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+                fi; \
+              done); \
+             rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+           else \
+             if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+               :; \
+             else \
+               rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+             fi; \
+           fi; \
+           rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+           ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+           ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+           cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+           echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+         done; \
        done
 
 install-strip: install
 
 installdirs: installdirs-exec installdirs-data
 installdirs-exec:
-installdirs-data: install-data-@USE_NLS@
+installdirs-data: installdirs-data-@USE_NLS@
        if test "$(PACKAGE)" = "gettext"; then \
          $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
        else \
@@ -145,6 +166,27 @@ installdirs-data-yes:
          lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
          dir=$(localedir)/$$lang/LC_MESSAGES; \
          $(mkinstalldirs) $(DESTDIR)$$dir; \
+         for lc in $(EXTRA_LOCALE_CATEGORIES); do \
+           if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+             link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+             mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+             mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+             (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+              for file in *; do \
+                if test -f $$file; then \
+                  ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+                fi; \
+              done); \
+             rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+           else \
+             if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+               :; \
+             else \
+               rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+             fi; \
+           fi; \
+         done; \
        done
 
 # Define this as empty until I found a useful application.
@@ -166,7 +208,9 @@ uninstall-data-yes:
        for cat in $$catalogs; do \
          cat=`basename $$cat`; \
          lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-         rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo; \
+         for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+           rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+         done; \
        done
 
 check: all

diff --git a/po/Makevars b/po/Makevars
index 3b74e7f7a9e644af165ea77d87ec5c838004f1ff..8b09f53b0f5446dcab87e1f0a748f8916c09d35f 100644 (file)
--- a/po/Makevars
+++ b/po/Makevars
@@ -19,3 +19,7 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
 # the public domain; in this case the translators are expected to disclaim
 # their copyright.
 COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =