Update.

	* timezone/Makefile (build-testdata): Set LANGUAGE and LC_ALL
	since zic uses setlocale and gettext but we cannot make it use the
	new locale data since zic calls a shell which might not use the
	new libc.

diff --git a/ChangeLog b/ChangeLog
index 419075ff0c3ff29fa00a689bf9fc397203bacc6a..d02e9acc11f6c12a4b937cb895a46bc845d1004b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2000-06-30  Ulrich Drepper  <drepper@redhat.com>
 
+       * timezone/Makefile (build-testdata): Set LANGUAGE and LC_ALL
+       since zic uses setlocale and gettext but we cannot make it use the
+       new locale data since zic calls a shell which might not use the
+       new libc.
+
        * stdlib/strfmon.c: Move somewhat closer to the standard wrt to
        handling the internation currency symbol.  POSIX says that the
        fourth character is used to separate the currency symbol from the

diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index b3d5c4091f372cb3ed1d73be740afb2c645e1117..217b709c305d6b094ea70a568594c73799323075 100644 (file)
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-30  Ulrich Drepper  <drepper@redhat.com>
+
+       * gen-locale.sh: Print that it might take a while to finish.
+
 2000-06-30  Jakub Jelinek  <jakub@redhat.com>
 
        * Makefile (install-locales): Remove the -u switch from localedef

diff --git a/localedata/gen-locale.sh b/localedata/gen-locale.sh
index 4bc7031f718c06bf6d3c9a5d771a1cbb49bb6aeb..ca110741c0cff0021f29509ca20f9f2fe234fdf8 100644 (file)
--- a/localedata/gen-locale.sh
+++ b/localedata/gen-locale.sh
@@ -37,9 +37,9 @@ generate_locale ()
     fi
 }
 
+echo "Generating locale data: this might take a while..."
 generate_locale UTF8 de_DE de_DE.UTF-8
 generate_locale ISO-8859-1 de_DE de_DE.ISO-8859-1
 generate_locale ISO-8859-1 en_US en_US.ISO-8859-1
 generate_locale EUC-JP ja_JP ja_JP.EUC-JP
 generate_locale ANSI_X3.4-1968 en_US en_US.ANSI_X3.4-1968
-

diff --git a/timezone/Makefile b/timezone/Makefile
index 93478d4948ca729134fa207a73cd28d7bcb37f35..d62d05a20812bc271fe3fb3bc1f78dd7bb16e09d 100644 (file)
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -174,7 +174,7 @@ CFLAGS-scheck.c = -Wno-strict-prototypes -DNOID
 # leapseconds.
 testdata = $(objpfx)testdata
 define build-testdata
-GCONV_PATH=${common-objpfx}iconvdata \
+GCONV_PATH=${common-objpfx}iconvdata LANGUAGE=C LC_ALL=C \
   $(built-program-cmd) -d $(testdata) -y ./yearistype $<
 endef