about summary refs log tree commit diff
path: root/localedata
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-09-23 14:26:51 +0000
committerUlrich Drepper <drepper@redhat.com>1998-09-23 14:26:51 +0000
commitaf56420374f0d2ff05f943146674d1538744b53f (patch)
treeb95b24e5c2dbdeca3202c52eb86c0a39c68e2ea3 /localedata
parent24fd4cc4512102239f408ad965c7d65229be90d3 (diff)
downloadglibc-af56420374f0d2ff05f943146674d1538744b53f.tar.gz
glibc-af56420374f0d2ff05f943146674d1538744b53f.tar.xz
glibc-af56420374f0d2ff05f943146674d1538744b53f.zip
Update.
	* db/makedb.c: Removed.
	* Makefile: Add localedata/% goal.
Diffstat (limited to 'localedata')
-rw-r--r--localedata/ChangeLog2
-rw-r--r--localedata/Makefile8
2 files changed, 4 insertions, 6 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index d920713908..f8e72b422f 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,6 +1,6 @@
 1998-09-23  Ulrich Drepper  <drepper@cygnus.com>
 
-	* Makefile [no install_root] (LOCALEDEF): Run localedef using jsut
+	* Makefile [no install_root] (LOCALEDEF): Run localedef using just
 	built ld.so.
 
 1998-06-15  Ulrich Drepper  <drepper@cygnus.com>
diff --git a/localedata/Makefile b/localedata/Makefile
index 231f3ac5dc..4108b7ed47 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -80,13 +80,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)elf/ld.so --library-path $(rpath-link) $(common-objpfx)locale/localedef
-endif
 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