aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-07-03 20:35:05 +0000
committerUlrich Drepper <drepper@redhat.com>2000-07-03 20:35:05 +0000
commit4a9e89d5eaf441ab9c834b92f5042eeebb9ffa63 (patch)
tree8e656c4b9de3cd8a2d7dd3c81fa80f77272a739d
parent40c4c9b56215596cff974f19bd8cedc762be32ed (diff)
downloadglibc-4a9e89d5eaf441ab9c834b92f5042eeebb9ffa63.tar
glibc-4a9e89d5eaf441ab9c834b92f5042eeebb9ffa63.tar.gz
glibc-4a9e89d5eaf441ab9c834b92f5042eeebb9ffa63.tar.bz2
glibc-4a9e89d5eaf441ab9c834b92f5042eeebb9ffa63.zip
Update.
2000-07-03 Ulrich Drepper <drepper@redhat.com> * tst-fmon.sh: Set LOCPATH and LANGUAGE for localedef run. * tst-locale.sh: Likewise.
-rw-r--r--localedata/ChangeLog5
-rwxr-xr-xlocaledata/tst-fmon.sh3
-rwxr-xr-xlocaledata/tst-locale.sh3
3 files changed, 9 insertions, 2 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index f28734b42e..5d3bad3e7b 100644
--- 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 ec8d2704f9..4b982fed4e 100755
--- 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 51a3a34062..e835029aab 100755
--- 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