(charmaps): Split wildcard to avoid shell limits.

[kopensolaris-gnu/glibc.git] / localedata / Makefile

diff --git a/localedata/Makefile b/localedata/Makefile
index b8cbac0..d53d523 100644 (file)
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -24,7 +24,8 @@ all: # Make this the default target; it will be defined in Rules.
 
 # List with all available character set descriptions.
 charmaps := $(filter-out $(addprefix charmaps/, CVS RCS %~), \
-                                    $(wildcard charmaps/*))
+                                    $(wildcard charmaps/[A-I]*) \
+                                    $(wildcard charmaps/[J-Z]*))
 
 # List with all available character set descriptions.
 locales := $(filter-out $(addprefix locales/, CVS RCS %~), \
@@ -35,7 +36,9 @@ repertoiremaps := $(filter-out $(addprefix repertoiremaps/, CVS RCS %~), \
                                           $(wildcard repertoiremaps/*))
 
 test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch
-test-input := de_DE.ISO-8859-1 da_DK.ISO-8859-1 fr_CA,2.13.ISO-8859-1
+test-input := de_DE.ISO-8859-1 da_DK.ISO-8859-1 fr_CA,2.13.ISO-8859-1 \
+             hr_HR.ISO-8859-2 
+test-input-data = $(addsuffix .in, $(basename $(test-input)))
 test-output := $(foreach s, .out .xout, \
                         $(addsuffix $s, $(basename $(test-input))))
 ld-test-names := test1 test2 test3 test4 test5
@@ -45,10 +48,10 @@ ld-test-srcs := $(addprefix tests/,$(addsuffix .cm,$(ld-test-names)) \
 generated := $(test-input) $(test-output)
 generated-dirs := $(basename $(test-input)) en_US $(ld-test-names)
 
-distribute := CHECKSUMS tst-fmon.sh tst-fmon.data ChangeLog sort-test.sh \
-             README fr_CA,2.13.in de_DE.in da_DK.in $(repertoiremaps)   \
-             $(charmaps) $(locales) $(ld-test-srcs) tst-rpmatch.sh      \
-             SUPPORTED tst-locale.sh
+distribute := CHECKSUMS README SUPPORTED ChangeLog                     \
+             $(charmaps) $(locales) $(repertoiremaps)                  \
+             tst-rpmatch.sh tst-locale.sh tst-fmon.sh sort-test.sh     \
+             tst-fmon.data $(test-input-data) $(ld-test-srcs)
 
 # Get $(inst_i18ndir) defined.
 include ../Makeconfig
@@ -69,7 +72,7 @@ ifeq (no,$(cross-compiling))
 .PHONY: do-collate-test do-tst-fmon do-tst-locale do-tst-rpmatch
 tests: do-collate-test do-tst-fmon do-tst-locale do-tst-rpmatch
 do-collate-test: sort-test.sh $(objpfx)collate-test $(objpfx)xfrm-test \
-                $(test-input:.ISO-8859-1=.in)
+                $(test-input-data)
        $(SHELL) -e $< $(common-objpfx) $(test-input)
 do-tst-fmon: tst-fmon.sh $(objpfx)tst-fmon tst-fmon.data  do-collate-test
        $(SHELL) -e $< $(common-objpfx) tst-fmon.data
@@ -80,13 +83,11 @@ do-tst-rpmatch: tst-rpmatch.sh $(objpfx)tst-rpmatch do-tst-fmon
 endif
 
 # Sometimes the whole collection of locale files should be installed.
-ifneq ($(install_root),)
-LOCALEDEF=chroot $(install_root) $(bindir)/localedef
-else
-LOCALEDEF=$(common-objpfx)locale/localedef
-endif
+LOCALEDEF=$(common-objpfx)elf/ld.so --library-path $(rpath-link) $(common-objpfx)locale/localedef
 install-locales:
        while read locale charset; do \
           case $$locale in \#*) continue;; esac; \
-          $(LOCALEDEF) -c -i $$locale -f $$charset $$locale; \
+          $(LOCALEDEF) -c -i locales/$$locale -f charmaps/$$charset \
+                       -u repertoiremaps/mnemonic.ds \
+                       $(inst_localedir)/$$locale; \
        done < SUPPORTED