(install-locales): Handle option in locale name. Print progress information.

diff --git a/localedata/Makefile b/localedata/Makefile
index 8bdbedfb9098dd94a9f1464e726fb4304272991b..0c27303f8f18cebbc4a828d921ea7ef5f98fbbd7 100644 (file)
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -181,14 +181,20 @@ $(objpfx)tst-digits.out: $(objpfx)tst-locale.out
 endif
 
 # Sometimes the whole collection of locale files should be installed.
-LOCALEDEF=I18NPATH=. $(common-objpfx)elf/ld.so --library-path $(rpath-link) $(common-objpfx)locale/localedef
+LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
+$(common-objpfx)elf/ld.so --library-path $(rpath-link) $(common-objpfx)locale/localedef
 install-locales:
        $(..)./scripts/mkinstalldirs $(inst_localedir)
        while read locale charset; do \
           case $$locale in \#*) continue;; esac; \
-          $(LOCALEDEF) -i locales/`echo $$locale | sed 's/\([^.]*\).*/\1/'` \
-                       -c -f charmaps/$$charset \
+          echo -n `echo $$locale | sed 's/\([^.\@]*\).*/\1/'`; \
+          echo -n ".$$charset"; \
+          echo -n `echo $$locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
+          echo -n '...'; \
+          input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
+          $(LOCALEDEF) -i locales/$$input -c -f charmaps/$$charset \
                        $(addprefix --prefix=,$(install_root)) $$locale; \
+          echo ' done'; \
        done < SUPPORTED
 
 # The mbwc-tests need some environment setup to find the locale data files