From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 21 Aug 2000 17:06:55 +0000 (+0000)
Subject: (install-locales): Handle option in locale name.  Print progress information.
X-Git-Tag: cvs/glibc-2_1_93~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=246a9a195fe0e238afaf4d3cb416d68261a8562d;p=thirdparty%2Fglibc.git

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

diff --git a/localedata/Makefile b/localedata/Makefile
index 8bdbedfb909..0c27303f8f1 100644
--- 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