summaryrefslogtreecommitdiffstats
path: root/perl-install/Makefile
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-17 09:51:00 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-17 09:51:00 +0000
commit2138caee5d80a58604bf6af0dacc121115b4eb62 (patch)
tree0b130e2a42d4ab2806e1b59e6ec1be09ad396476 /perl-install/Makefile
parentfac2ae48d93c5bf4f93025ecb71eb21a62b540d1 (diff)
downloaddrakx-backup-do-not-use-2138caee5d80a58604bf6af0dacc121115b4eb62.tar
drakx-backup-do-not-use-2138caee5d80a58604bf6af0dacc121115b4eb62.tar.gz
drakx-backup-do-not-use-2138caee5d80a58604bf6af0dacc121115b4eb62.tar.bz2
drakx-backup-do-not-use-2138caee5d80a58604bf6af0dacc121115b4eb62.tar.xz
drakx-backup-do-not-use-2138caee5d80a58604bf6af0dacc121115b4eb62.zip
- 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
Diffstat (limited to 'perl-install/Makefile')
-rw-r--r--perl-install/Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index ae743fe85..86dd6feb4 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -79,8 +79,6 @@ install_pms: $(DIRS)
mo_files : $(MOFILES)
get_needed_files: $(DIRS) mo_files
- $(MAKE) -C share
-
eval `perl -V:version`; \
cat share/list `../tools/specific_arch share/list` | \
perl -pe "s/ARCH/$(ARCH)/g ; s/PERL_VERSION/$$version/g ; s|/LIB/|/$(LIB)/|g " | \
@@ -109,7 +107,7 @@ get_needed_files: $(DIRS) mo_files
install -d $(DEST)/usr/share/langs
install -d $(DEST)/usr/share/gtk
install -d $(DEST)/usr/share/xmodmap
- install -d $(DEST)/usr/X11R6/lib/X11
+ install -d $(DEST)/usr/X11R6/lib/X11/locale
install -d $(MEDIA_INFO_DEST)
install -s $(LOCALFILES) $(DEST)/usr/bin
# cp -f $(LOCALFILES2) $(DEST)/usr/bin
@@ -120,6 +118,8 @@ ifeq (sparc,$(ARCH))
ln -s /tmp $(DEST)/usr/X11R6/lib/X11/xkb/compiled
ln -s /usr/X11R6/lib/X11/xkb/xkbcomp $(DEST)/usr/bin/xkbcomp
endif
+ cp -a /usr/X11R6/lib/X11/locale/{C,en_US.UTF-8,iso8859-1} $(DEST)/usr/X11R6/lib/X11/locale
+
ifeq (i386,$(ARCH))
install -s /sbin/cardmgr $(DEST)/usr/bin
endif
@@ -163,7 +163,7 @@ else
ln -sf ash $(DEST)/usr/bin/sh
endif
- for i in fonts keyboards locales keymaps; do tar xfj `../tools/specific_arch share/$$i.tar.bz2` -C $(DEST); done
+ for i in fonts keyboards locales-skeleton keymaps; do tar xfj `../tools/specific_arch share/$$i.tar.bz2` -C $(DEST); done
grep ChangeLog CVS/Entries > $(DEST)/usr/share/VERSION
@@ -175,6 +175,8 @@ endif
cp `perl -I. -Mlang -e 'lang::png_lang_files()'` $(DEST)/usr/share/langs
cd share ; cp compssUsers.pl* rpmsrate $(MEDIA_INFO_DEST)
+ perl -I. -Mlang -e 'symlink "UTF-8", "$(DEST)/usr/share/locale/$$_" foreach lang::list_langs()'
+
clean-rpmsrate $(MEDIA_INFO_DEST)/rpmsrate $(MAIN_RPMS_DIR)
for i in ../kernel/modules.description ../kernel/all.modules/modules.cz*; do cp -f $$i $(DEST)/lib/; done