about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2001-08-09 17:15:56 +0000
committerAndreas Jaeger <aj@suse.de>2001-08-09 17:15:56 +0000
commitd4459f83de18527316eca4c5ad773380cbf13c09 (patch)
tree44f88a126cbbe40a781412b20195a5f28ac0a37e
parentde1fe205b9225214d93052c85d6aa376049ae6a7 (diff)
downloadglibc-d4459f83de18527316eca4c5ad773380cbf13c09.tar.gz
glibc-d4459f83de18527316eca4c5ad773380cbf13c09.tar.xz
glibc-d4459f83de18527316eca4c5ad773380cbf13c09.zip
Revert last patch, Ulrich will fix the failing script to use de_DE.UTF-8.
-rw-r--r--localedata/ChangeLog4
-rw-r--r--localedata/Makefile2
2 files changed, 1 insertions, 5 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index e8cbe494d1..ce1734d0a6 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,7 +1,3 @@
-2001-08-09  Andreas Jaeger  <aj@suse.de>
-
-	* Makefile (LOCALES): Generate en_US.UTF-8 locale.
-
 2001-08-04  Ulrich Drepper  <drepper@redhat.com>
 
 	* charmaps/GEORGIAN-PS: New file.
diff --git a/localedata/Makefile b/localedata/Makefile
index decaa129ef..8866b693e4 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -128,7 +128,7 @@ CFLAGS-tst-trans.c = -Wno-format
 ifeq (no,$(cross-compiling))
 # We have to generate locales
 LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
-	   en_US.ISO-8859-1 en_US.UTF-8 ja_JP.EUC-JP da_DK.ISO-8859-1 \
+	   en_US.ISO-8859-1 ja_JP.EUC-JP da_DK.ISO-8859-1 \
 	   hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1
 LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g')
 CHARMAPS := $(shell echo "$(LOCALES)" | \