diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-07-12 20:06:44 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-07-12 20:06:44 +0000 |
| commit | 9f835f5fb48eb6e173a7ca3c678595dba28c5e7a (patch) | |
| tree | 34f261d68fe97fc358f706dc8883ecfdfd450caf /localedata/gen-locale.sh | |
| parent | 50a6564365575ba9d20a6cfde261ec5fcbb9ff35 (diff) | |
| download | glibc-9f835f5fb48eb6e173a7ca3c678595dba28c5e7a.tar glibc-9f835f5fb48eb6e173a7ca3c678595dba28c5e7a.tar.gz glibc-9f835f5fb48eb6e173a7ca3c678595dba28c5e7a.tar.bz2 glibc-9f835f5fb48eb6e173a7ca3c678595dba28c5e7a.zip | |
Update.
2000-07-12 Bruno Haible <haible@clisp.cons.org>
* iconv/gconv_open.c (__gconv_open): Merge duplicated code.
2000-07-12 Bruno Haible <haible@clisp.cons.org>
* iconv/gconv_builtin.c (__gconv_get_builtin_trans): Initialize
__modname.
2000-07-12 Bruno Haible <haible@clisp.cons.org>
* iconv/gconv_open.c (__gconv_open): Initialize
result->__steps[cnt].__data.
2000-07-12 Mark Kettenis <kettenis@gnu.org>
* nss/getent.c (services_keys): Pass port number in network byte
order in call to getservbyport.
2000-07-11 Andreas Jaeger <aj@suse.de>
* stdlib/Makefile (test-canon-ARGS): Fix for building in the
source dir.
* intl/Makefile (do-gettext-test): Likewise.
* dirent/Makefile (opendir-tst1-ARGS): Likewise.
2000-07-11 Andreas Schwab <schwab@suse.de>
* Makeconfig (run-program-prefix): New rule.
(built-program-cmd): Use run-program-prefix.
Diffstat (limited to 'localedata/gen-locale.sh')
| -rw-r--r-- | localedata/gen-locale.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/localedata/gen-locale.sh b/localedata/gen-locale.sh index b68e364a1e..386665ca02 100644 --- a/localedata/gen-locale.sh +++ b/localedata/gen-locale.sh @@ -19,6 +19,7 @@ # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. common_objpfx="$1"; shift +localedef="$1"; shift locfile="$1"; shift generate_locale () @@ -27,8 +28,7 @@ generate_locale () input=$2 out=$3 I18NPATH=. GCONV_PATH=${common_objpfx}iconvdata \ - ${common_objpfx}elf/ld.so --library-path $common_objpfx \ - ${common_objpfx}locale/localedef --quiet -c -f $charmap -i $input \ + ${localedef} --quiet -c -f $charmap -i $input \ ${common_objpfx}localedata/$out if [ $? -ne 0 ]; then @@ -38,8 +38,9 @@ generate_locale () fi } -locale=`echo $locfile|sed 's|.*/\([^/.]*\)[.].*/LC_CTYPE|\1|'` -charmap=`echo $locfile|sed 's|.*/[^/.]*[.]\(.*\)/LC_CTYPE|\1|'` +locfile=`echo $locfile|sed 's|.*/\([^/]*/LC_CTYPE\)|\1|'` +locale=`echo $locfile|sed 's|\([^.]*\)[.].*/LC_CTYPE|\1|'` +charmap=`echo $locfile|sed 's|[^.]*[.]\(.*\)/LC_CTYPE|\1|'` echo "Generating locale $locale.$charmap: this might take a while..." generate_locale $charmap $locale $locale.$charmap |