Update.

	* Makefile (install-locales): Allow specifying charset in locale
	name but omit it in locale definition file.

diff --git a/NEWS b/NEWS
index b26a88cca5158440fc2c82346978b70fdda74e85..eacf2bd78366c8ccbe196f92b057fa26cc39892a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,10 @@ Version 2.1.1
 
 * Update timezone data files.
 
+* lots of charmaps corrections
+
+* some new locale definitions and charmaps
+
 \f
 Version 2.1
 

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 312960e4fc37296c9bea78d672ccd8ebf3bfa3ae..0832f04f15fd371720733b25a80bcc818549f1e5 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,8 @@
 1999-04-29  Ulrich Drepper  <drepper@cygnus.com>
 
+       * Makefile (install-locales): Allow specifying charset in locale
+       name but omit it in locale definition file.
+
        * SUPPORTED: Don't generate ru_SU.
        * locales/ru_SU: Removed.
 

diff --git a/localedata/Makefile b/localedata/Makefile
index 6784982ecf325b1743cdfebeebd44044461aea5a..5bb4702bebaaf1a76624f46173866ba0cbda03fc 100644 (file)
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -89,7 +89,8 @@ LOCALEDEF=$(common-objpfx)elf/ld.so --library-path $(rpath-link) $(common-objpfx
 install-locales:
        while read locale charset; do \
           case $$locale in \#*) continue;; esac; \
-          $(LOCALEDEF) -c -i locales/$$locale -f charmaps/$$charset \
+          $(LOCALEDEF) -i locales/`echo $$locale | sed 's/\([^.]*\).*/\1/'` \
+                       -c -f charmaps/$$charset \
                        -u repertoiremaps/mnemonic.ds \
                        $(inst_localedir)/$$locale; \
        done < SUPPORTED

diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
index a2cbb0474c9420b8fd27d2b3d4d51492810b99c3..8d16fa0498968f25e5fe7b662bb1eb0129049a05 100644 (file)
--- a/localedata/SUPPORTED
+++ b/localedata/SUPPORTED
@@ -44,7 +44,7 @@ pt_BR ISO-8859-1
 pt_PT ISO-8859-1
 ro_RO ISO-8859-2
 ru_RU ISO-8859-5
-ru_RU KOI8-R
+ru_RU.KOI8-R KOI8-R
 ru_UA KOI8-U
 sk_SK ISO-8859-2
 sl_SI ISO-8859-2