From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 29 Apr 1999 15:04:27 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_1_1~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=554b88001829abe401ccc81ca9ab41dcac5e74eb;p=thirdparty%2Fglibc.git

Update.

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

diff --git a/NEWS b/NEWS
index b26a88cca51..eacf2bd7836 100644
--- 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
+
 
 Version 2.1
 
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 312960e4fc3..0832f04f15f 100644
--- 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 6784982ecf3..5bb4702beba 100644
--- 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 a2cbb0474c9..8d16fa04989 100644
--- 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