From 9f835f5fb48eb6e173a7ca3c678595dba28c5e7a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 12 Jul 2000 20:06:44 +0000 Subject: Update. 2000-07-12 Bruno Haible * iconv/gconv_open.c (__gconv_open): Merge duplicated code. 2000-07-12 Bruno Haible * iconv/gconv_builtin.c (__gconv_get_builtin_trans): Initialize __modname. 2000-07-12 Bruno Haible * iconv/gconv_open.c (__gconv_open): Initialize result->__steps[cnt].__data. 2000-07-12 Mark Kettenis * nss/getent.c (services_keys): Pass port number in network byte order in call to getservbyport. 2000-07-11 Andreas Jaeger * 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 * Makeconfig (run-program-prefix): New rule. (built-program-cmd): Use run-program-prefix. --- localedata/sort-test.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'localedata/sort-test.sh') diff --git a/localedata/sort-test.sh b/localedata/sort-test.sh index 18dbcd5362..6c22524612 100644 --- a/localedata/sort-test.sh +++ b/localedata/sort-test.sh @@ -1,6 +1,7 @@ #! /bin/sh common_objpfx=$1; shift +run_program_prefix=$1; shift lang=$* id=${PPID:-100} @@ -11,13 +12,13 @@ status=0 for l in $lang; do cns=`echo $l | sed 's/\(.*\)[.][^.]*/\1/'` LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}/iconvdata \ - LC_ALL=$l ${common_objpfx}elf/ld.so --library-path $common_objpfx \ + LC_ALL=$l ${run_program_prefix} \ ${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 GCONV_PATH=${common_objpfx}/iconvdata \ - LC_ALL=$l ${common_objpfx}elf/ld.so --library-path $common_objpfx \ + LC_ALL=$l ${run_program_prefix} \ ${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 -- cgit 1.4.1