diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-07-31 14:49:48 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-07-31 14:49:48 +0000 |
| commit | 64e3e07d87dbe5e98151e3a86fb5720720c8ee74 (patch) | |
| tree | 3737266fd04cd101b3d85c7cebce436f4bd249ed | |
| parent | 76425ca68c6c989bb2b53058e039b20da6fead80 (diff) | |
| download | drakx-backup-do-not-use-64e3e07d87dbe5e98151e3a86fb5720720c8ee74.tar drakx-backup-do-not-use-64e3e07d87dbe5e98151e3a86fb5720720c8ee74.tar.gz drakx-backup-do-not-use-64e3e07d87dbe5e98151e3a86fb5720720c8ee74.tar.bz2 drakx-backup-do-not-use-64e3e07d87dbe5e98151e3a86fb5720720c8ee74.tar.xz drakx-backup-do-not-use-64e3e07d87dbe5e98151e3a86fb5720720c8ee74.zip | |
better handling of locales
| -rw-r--r-- | perl-install/Makefile | 1 | ||||
| -rw-r--r-- | perl-install/share/Makefile | 5 | ||||
| -rwxr-xr-x | perl-install/share/gen_locales.sh | 15 | ||||
| -rw-r--r-- | perl-install/share/locales-skeleton.tar.bz2 | bin | 25822 -> 25860 bytes |
4 files changed, 7 insertions, 14 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index 6c79c43f3..9dc6dc2e8 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -123,7 +123,6 @@ ifeq (i386,$(ARCH)) endif ln -sf ash $(DEST)/usr/bin/sh - cd share ; ./gen_locales.sh for i in fonts keyboards locales keymaps; do tar xfj `../tools/specific_arch share/$$i.tar.bz2` -C $(DEST); done grep ChangeLog CVS/Entries > $(DEST)/usr/share/VERSION diff --git a/perl-install/share/Makefile b/perl-install/share/Makefile new file mode 100644 index 000000000..00e5afcc3 --- /dev/null +++ b/perl-install/share/Makefile @@ -0,0 +1,5 @@ +all: locales.tar.bz2 + +# /usr/lib/libc.a to depend on the current glibc +locales.tar.bz2: locales-skeleton.tar.bz2 gen_locales.sh /usr/lib/libc.a + ./gen_locales.sh diff --git a/perl-install/share/gen_locales.sh b/perl-install/share/gen_locales.sh index bb330d888..8f6c09c1f 100755 --- a/perl-install/share/gen_locales.sh +++ b/perl-install/share/gen_locales.sh @@ -1,14 +1,5 @@ #!/bin/sh -locales=`rpm -q locales` -file="$locales-drakx.tar.bz2" - -# already build? -[ -e $file ] && exit 0 - -# remove previous ones -rm -f locales-*-drakx.tar.bz2 - rm -rf .tmp ; mkdir .tmp ; cd .tmp tar xfj ../locales-skeleton.tar.bz2 @@ -18,7 +9,7 @@ for i in LC_ADDRESS LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MONE done # lc_ctype for common encoding -for i in CP1251 CP1255 CP1256 ISO-8859-13 ISO-8859-14 ISO-8859-15 ISO-8859-2 ISO-8859-3 ISO-8859-5 ISO-8859-7 ISO-8859-9 ISO-8859-9E ; do +for i in CP1251 CP1255 CP1256 ISO-8859-13 ISO-8859-14 ISO-8859-15 ISO-8859-2 ISO-8859-3 ISO-8859-5 ISO-8859-7 ISO-8859-9 ISO-8859-9E KOI8-U ; do f=usr/share/locale/$i/LC_CTYPE [ -e /$f ] || { echo missing /$f ; exit 1 ; } cp -f /$f $f @@ -35,8 +26,6 @@ for i in hy ja ko ta th vi zh_CN.GB2312 zh_TW.Big5 ; do done cd .. ; rm -rf .tmp2 -tar cfj ../$file usr +tar cfj ../locales.tar.bz2 usr cd .. ; rm -rf .tmp - -ln -sf $file locales.tar.bz2 diff --git a/perl-install/share/locales-skeleton.tar.bz2 b/perl-install/share/locales-skeleton.tar.bz2 Binary files differindex 9e96c72ca..662a8d1f5 100644 --- a/perl-install/share/locales-skeleton.tar.bz2 +++ b/perl-install/share/locales-skeleton.tar.bz2 |