Update.

2004-03-31  Ulrich Drepper  <drepper@redhat.com>

	* locale/programs/localedef.c (construct_output_path): Remove
	remnants of CEN locale names.

diff --git a/ChangeLog b/ChangeLog
index ab5c27408b43f143292ffdf9af4e5ae6fb303245..5fcf8cccdc05882df1898601f42d3898d7506567 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-31  Ulrich Drepper  <drepper@redhat.com>
+
+       * locale/programs/localedef.c (construct_output_path): Remove
+       remnants of CEN locale names.
+
 2004-03-30  Thorsten Kukuk  <kukuk@suse.de>
 
        * sysdeps/unix/sysv/linux/alpha/bits/termios.h: Add IUTF8.

diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index f2c3c3b89c51658615c3839f03c0535fc080b62a..b38ce6c53e5611af7cc61408dbcc35a9ee4b823f 100644 (file)
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -421,8 +421,7 @@ construct_output_path (char *path)
       startp = path;
       /* We must be prepared for finding a CEN name or a location of
         the introducing `.' where it is not possible anymore.  */
-      while (*startp != '\0' && *startp != '@' && *startp != '.'
-            && *startp != '+' && *startp != ',')
+      while (*startp != '\0' && *startp != '@' && *startp != '.')
        ++startp;
       if (*startp == '.')
        {