Update.

2000-07-03  Ulrich Drepper  <drepper@redhat.com>

	* tst-fmon.sh: Set LOCPATH and LANGUAGE for localedef run.
	* tst-locale.sh: Likewise.

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index f28734b42e1184bd14057f225d21ff0bf3561160..5d3bad3e7b69a42874e693cc86a8dce7e818151f 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-03  Ulrich Drepper  <drepper@redhat.com>
+
+       * tst-fmon.sh: Set LOCPATH and LANGUAGE for localedef run.
+       * tst-locale.sh: Likewise.
+
 2000-07-01  Andreas Jaeger  <aj@suse.de>
 
        * Makefile (generated-dirs): LOCALES are also generated.

diff --git a/localedata/tst-fmon.sh b/localedata/tst-fmon.sh
index ec8d2704f9140e92a607769080f84d7b98783b96..4b982fed4e6da2910de0cc4f1e19f62cd46d7f49 100755 (executable)
--- a/localedata/tst-fmon.sh
+++ b/localedata/tst-fmon.sh
@@ -35,7 +35,8 @@ lang=`sed -e '/^#/d' -e '/^$/d' -e '/^C       /d' -e '/^tstfmon/d' -e 's/^\([^        ]*\).*/
 for cns in `cd ./tst-fmon-locales && ls tstfmon_*`; do
     cn=tst-fmon-locales/$cns
     fn=charmaps/ISO-8859-1
-    I18NPATH=. GCONV_PATH=${common_objpfx}/iconvdata \
+    I18NPATH=. GCONV_PATH=${common_objpfx}iconvdata \
+    LOCPATH=${common_objpfx}localedata LANGUAGE=C \
     ${common_objpfx}elf/ld.so --library-path $common_objpfx \
     ${common_objpfx}locale/localedef \
     --quiet -i $cn -f $fn ${common_objpfx}localedata/$cns

diff --git a/localedata/tst-locale.sh b/localedata/tst-locale.sh
index 51a3a34062b0abc6e048714660a32e9b33fdea26..e835029aab66e774ebd8c739d3de18421c129499 100755 (executable)
--- a/localedata/tst-locale.sh
+++ b/localedata/tst-locale.sh
@@ -30,7 +30,8 @@ test_locale ()
     if test $rep; then
       rep="--repertoire-map $rep"
     fi
-    I18NPATH=. GCONV_PATH=${common_objpfx}/iconvdata \
+    I18NPATH=. GCONV_PATH=${common_objpfx}iconvdata \
+    LOCPATH=${common_objpfx}localedata LANGUAGE=C \
     ${common_objpfx}elf/ld.so --library-path $common_objpfx \
     ${common_objpfx}locale/localedef --quiet -c -f $charmap -i $input \
       ${rep} ${common_objpfx}localedata/$out