From 96d5556deb8427ec2e2dd183c99e80f430043d49 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Fri, 9 Apr 2004 09:38:20 +0000
Subject: (lang::write_langs) drop prefix parameter

---
 perl-install/install_steps.pm | 2 +-
 perl-install/lang.pm          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 23df4874b..70cec9202 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -124,7 +124,7 @@ sub selectLanguage {
     $o->charsetChanged;
 
     addToBeDone {
-	lang::write_langs($o->{prefix}, $o->{locale}{langs});
+	lang::write_langs($o->{locale}{langs});
     } 'formatPartitions';
     addToBeDone {
 	lang::write($o->{prefix}, $o->{locale});
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 8002255af..22d78b5ad 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -904,10 +904,10 @@ sub read {
 }
 
 sub write_langs {
-    my ($prefix, $langs) = @_;
+    my ($langs) = @_;
     my $s = pack_langs($langs);
-    symlink "$prefix/etc/rpm", "/etc/rpm" if $prefix;
-    substInFile { s/%_install_langs.*//; $_ .= "%_install_langs $s\n" if eof && $s } "$prefix/etc/rpm/macros";
+    symlink "$::prefix/etc/rpm", "/etc/rpm" if $::prefix;
+    substInFile { s/%_install_langs.*//; $_ .= "%_install_langs $s\n" if eof && $s } "$::prefix/etc/rpm/macros";
 }
 
 sub i18n_env {
-- 
cgit v1.2.1