From 2138caee5d80a58604bf6af0dacc121115b4eb62 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 17 Aug 2004 09:51:00 +0000
Subject: - don't generate locales.tar.bz2, do the same directly (since it's
 now quite simple) - when using ramdisk, we now have all the locales, no need
 to handle it specially

---
 perl-install/share/Makefile       |  6 ------
 perl-install/share/gen_locales.pl | 12 ------------
 perl-install/share/gen_locales.sh | 19 -------------------
 perl-install/share/list           | 12 ++++++++++++
 4 files changed, 12 insertions(+), 37 deletions(-)
 delete mode 100644 perl-install/share/Makefile
 delete mode 100644 perl-install/share/gen_locales.pl
 delete mode 100755 perl-install/share/gen_locales.sh

(limited to 'perl-install/share')

diff --git a/perl-install/share/Makefile b/perl-install/share/Makefile
deleted file mode 100644
index 732724179..000000000
--- a/perl-install/share/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-all: locales.tar.bz2
-
-# /usr/lib/libc.a to depend on the current glibc
-# /usr/share/i18n/locale/en_US to ensure we have glibc-localedata
-locales.tar.bz2: locales-skeleton.tar.bz2 gen_locales.sh /usr/lib/libc.a /usr/share/i18n/locales/en_US
-	./gen_locales.sh
diff --git a/perl-install/share/gen_locales.pl b/perl-install/share/gen_locales.pl
deleted file mode 100644
index fcc03f0c9..000000000
--- a/perl-install/share/gen_locales.pl
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/perl
-
-use MDK::Common;
-use lang;
-
-foreach (lang::list_langs()) {
-    if (my $exist = readlink "usr/share/locale/$_") {
-	die "symlink $_ already exist and is $exist\n";
-    } else {
-	symlink "en_US.UTF-8", "usr/share/locale/$_" or die "can't create symlink $_";
-    }
-}
diff --git a/perl-install/share/gen_locales.sh b/perl-install/share/gen_locales.sh
deleted file mode 100755
index 6d1ed5fe1..000000000
--- a/perl-install/share/gen_locales.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-rm -rf .tmp ; mkdir .tmp ; cd .tmp
-tar xfj ../locales-skeleton.tar.bz2
-
-# locale utf-8
-for i in LC_ADDRESS LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME LC_MESSAGES/SYS_LC_MESSAGES ; do
-    install -D -m 644 /usr/share/locale/UTF-8/$i usr/share/locale/en_US.UTF-8/$i
-done
-
-perl -I../.. ../gen_locales.pl || exit 1
-
-for i in C en_US.UTF-8 iso8859-1 ; do
-    cp -a /usr/X11R6/lib/X11/locale/$i usr/X11R6/lib/X11/locale
-done
-
-tar cfj ../locales.tar.bz2 usr
-
-cd .. ; rm -rf .tmp
diff --git a/perl-install/share/list b/perl-install/share/list
index 2d816fc1a..1d43a396f 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -162,6 +162,18 @@
 /usr/share/ldetect-lst/isdn.db
 /usr/share/ldetect-lst/pcitable
 /usr/share/ldetect-lst/usbtable
+/usr/share/locale/UTF-8/LC_ADDRESS
+/usr/share/locale/UTF-8/LC_COLLATE
+/usr/share/locale/UTF-8/LC_CTYPE
+/usr/share/locale/UTF-8/LC_IDENTIFICATION
+/usr/share/locale/UTF-8/LC_MEASUREMENT
+/usr/share/locale/UTF-8/LC_MONETARY
+/usr/share/locale/UTF-8/LC_NAME
+/usr/share/locale/UTF-8/LC_NUMERIC
+/usr/share/locale/UTF-8/LC_PAPER
+/usr/share/locale/UTF-8/LC_TELEPHONE
+/usr/share/locale/UTF-8/LC_TIME
+/usr/share/locale/UTF-8/LC_MESSAGES/SYS_LC_MESSAGES
 /bin/brltty
 /etc/brltty/text.*.tbl
 /etc/brltty/brltty-??.hlp
-- 
cgit v1.2.1