Improve gen-locales.mk and gen-locale.sh to make test files with @ options work

With out this, adding collation test files like localedata/gez_ER.UTF-8@abegede.in
does not work for locales which contain @ modifiers.

	* gen-locales.mk: Make test files which contain @ modifiers in their
        name work.
	* localedata/gen-locale.sh: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 3bff7b8266bbcca1e6c4791887cf5714876390f8..3cce5f70f7d5120b6e01d69193e05783e07e836a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-27  Mike FABIAN  <mfabian@redhat.com>
+
+       * gen-locales.mk: Make test files which contain @ modifiers in their
+       name work.
+       * localedata/gen-locale.sh: Likewise.
+
 2018-02-27  Mike FABIAN  <mfabian@redhat.com>
 
        * posix/tst-fnmatch.input: Fix results for range expressions

diff --git a/gen-locales.mk b/gen-locales.mk
index fd88b5bef16c0fa5f2706fa7c1b381bc7f06182b..9c523d2a0585216cbc3e5e41784a813abb42b22c 100644 (file)
--- a/gen-locales.mk
+++ b/gen-locales.mk
@@ -1,8 +1,8 @@
 # defines target $(gen-locales) that generates the locales given in $(LOCALES)
 
-LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g')
+LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^@ ]*\(@[^ ]*\)\?/\1\2/g')
 CHARMAPS := $(shell echo "$(LOCALES)" | \
-                   sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g)
+                   sed -e 's/[^ .]*[.]\([^@ ]*\)\(@[^@ ]*\)*/\1/g' -e s/SJIS/SHIFT_JIS/g)
 CTYPE_FILES = $(addsuffix /LC_CTYPE,$(LOCALES))
 gen-locales := $(addprefix $(common-objpfx)localedata/,$(CTYPE_FILES))
 

diff --git a/localedata/gen-locale.sh b/localedata/gen-locale.sh
index 1bba5fee9245764740baea8b5dd387084391ba13..b91e42af13cda1f625e1bc07c8d2d369459340ba 100644 (file)
--- a/localedata/gen-locale.sh
+++ b/localedata/gen-locale.sh
@@ -49,7 +49,8 @@ generate_locale ()
 
 locfile=`echo $locfile|sed 's|.*/\([^/]*/LC_CTYPE\)|\1|'`
 locale=`echo $locfile|sed 's|\([^.]*\)[.].*/LC_CTYPE|\1|'`
-charmap=`echo $locfile|sed 's|[^.]*[.]\(.*\)/LC_CTYPE|\1|'`
+charmap=`echo $locfile|sed 's|[^.]*[.]\([^@ ]*\)\(@[^ ]*\)\?/LC_CTYPE|\1|'`
+modifier=`echo $locfile|sed 's|[^.]*[.]\([^@ ]*\)\(@[^ ]*\)\?/LC_CTYPE|\2|'`
 
 echo "Generating locale $locale.$charmap: this might take a while..."
 
@@ -73,4 +74,4 @@ if [ "$charmap_real" = 'SHIFT_JIS' ] \
   flags="$flags --no-warnings=ascii"
 fi
 
-generate_locale $charmap_real $locale $locale.$charmap "$flags"
+generate_locale $charmap_real $locale$modifier $locale.$charmap$modifier "$flags"