diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-04-29 15:04:27 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-04-29 15:04:27 +0000 |
| commit | 554b88001829abe401ccc81ca9ab41dcac5e74eb (patch) | |
| tree | 3918655692668584ceb776ad170cac8549fce05d /localedata | |
| parent | 49cee6968b08aa52af2fb1be127f0a8046371c2c (diff) | |
| download | glibc-554b88001829abe401ccc81ca9ab41dcac5e74eb.tar.gz glibc-554b88001829abe401ccc81ca9ab41dcac5e74eb.tar.xz glibc-554b88001829abe401ccc81ca9ab41dcac5e74eb.zip | |
Update.
* Makefile (install-locales): Allow specifying charset in locale name but omit it in locale definition file.
Diffstat (limited to 'localedata')
| -rw-r--r-- | localedata/ChangeLog | 3 | ||||
| -rw-r--r-- | localedata/Makefile | 3 | ||||
| -rw-r--r-- | localedata/SUPPORTED | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 312960e4fc..0832f04f15 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 6784982ecf..5bb4702beb 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 a2cbb0474c..8d16fa0498 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 |