diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-06-25 18:14:28 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-06-25 18:14:28 +0000 |
| commit | 07dab0c38525997dc9984f583a71f3b1cbd44cbd (patch) | |
| tree | 4a37a32c9705fe1170d548d603ad5dbf7ea531a6 /localedata/sort-test.sh | |
| parent | ab80bec0cbf512c51f040b36a90a732fcaaa397e (diff) | |
| download | glibc-07dab0c38525997dc9984f583a71f3b1cbd44cbd.tar glibc-07dab0c38525997dc9984f583a71f3b1cbd44cbd.tar.gz glibc-07dab0c38525997dc9984f583a71f3b1cbd44cbd.tar.bz2 glibc-07dab0c38525997dc9984f583a71f3b1cbd44cbd.zip | |
Update.
2000-06-25 Ulrich Drepper <drepper@redhat.com>
* locale/programs/ld-collate.c: Correct handling of different
collation sections.
* locale/programs/localedef.c (add_to_readlist): Take locale pointer
as extra parameter from which to copy category information.
Change all callers.
(load_locale): Likewise.
* locale/programs/localedef.h: Update prototypes of add_to_readlist
and load_locale.
* locale/programs/ld-ctype.c: Update call to add_to_readlist.
* locale/programs/locfile.h: Likewise.
* locale/programs/locfile-kw.gperf: Add entry for script.
* locale/programs/locfile-token.h: Add tok_script.
* locale/programs/locale.c: Update copyright year.
* locale/programs/localedef.c: Likewise.
* xdr_rec.c (set_input_fragment): Fix PR libc/1549, patch from Jens
Diffstat (limited to 'localedata/sort-test.sh')
| -rw-r--r-- | localedata/sort-test.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/localedata/sort-test.sh b/localedata/sort-test.sh index 322d40cb2c..be5693a492 100644 --- a/localedata/sort-test.sh +++ b/localedata/sort-test.sh @@ -11,7 +11,8 @@ for l in $lang; do cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'` cn=locales/$cns fn=charmaps/`echo $l | sed 's/.*[.]\([^.]*\)/\1/'` - I18NPATH=. ${common_objpfx}elf/ld.so --library-path $common_objpfx \ + I18NPATH=. GCONV_PATH=${common_objpfx}/iconvdata \ + ${common_objpfx}elf/ld.so --library-path $common_objpfx \ ${common_objpfx}locale/localedef --quiet -i $cn -f $fn \ ${common_objpfx}localedata/$cns done @@ -20,14 +21,14 @@ done status=0 for l in $lang; do cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'` - LOCPATH=${common_objpfx}localedata LC_ALL=$cns \ - ${common_objpfx}elf/ld.so --library-path $common_objpfx \ + LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}/iconvdata \ + LC_ALL=$cns ${common_objpfx}elf/ld.so --library-path $common_objpfx \ ${common_objpfx}localedata/collate-test $id < $cns.in \ > ${common_objpfx}localedata/$cns.out || status=1 cmp -s $cns.in ${common_objpfx}localedata/$cns.out || status=1 - LOCPATH=${common_objpfx}localedata LC_ALL=$cns \ - ${common_objpfx}elf/ld.so --library-path $common_objpfx \ + LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}/iconvdata \ + LC_ALL=$cns ${common_objpfx}elf/ld.so --library-path $common_objpfx \ ${common_objpfx}localedata/xfrm-test $id < $cns.in \ > ${common_objpfx}localedata/$cns.xout || status=1 cmp -s $cns.in ${common_objpfx}localedata/$cns.xout || status=1 |