From 4fa55b5793ef632fdf745e0d78c4f930743fa5e1 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 18 Jul 2002 16:48:57 +0000
Subject: use $::prefix instead of $::o->{prefix}

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

diff --git a/perl-install/common.pm b/perl-install/common.pm
index d982226e6..c2e853694 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -139,7 +139,7 @@ sub group_n_lm {
 }
 
 sub screenshot_dir__and_move {
-    my ($dir1, $dir2) = ("$::o->{prefix}/root", '/tmp/stage2');
+    my ($dir1, $dir2) = ("$::prefix/root", '/tmp/stage2');
     if (-e $dir1) {
 	if (-e "$dir2/DrakX-screenshots") {
 	    cp_af("$dir2/DrakX-screenshots", $dir1);
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 401de60ef..ab89918d6 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -41,7 +41,7 @@ my $cdrom = undef;
 sub useMedium($) {
     #- before ejecting the first CD, there are some files to copy!
     #- does nothing if the function has already been called.
-    $_[0] > 1 and $::o->{method} eq 'cdrom' and setup_postinstall_rpms($::o->{prefix}, $::o->{packages});
+    $_[0] > 1 and $::o->{method} eq 'cdrom' and setup_postinstall_rpms($::prefix, $::o->{packages});
 
     $asked_medium eq $_[0] or log::l("selecting new medium '$_[0]'");
     $asked_medium = $_[0];
@@ -501,7 +501,7 @@ sub setupFB {
 
 sub hdInstallPath() {
     my $tail = first(readlink("/tmp/image") =~ m|^/tmp/hdimage/(.*)|);
-    my $head = first(readlink("/tmp/hdimage") =~ m|$::o->{prefix}(.*)|);
+    my $head = first(readlink("/tmp/hdimage") =~ m|$::prefix(.*)|);
     $tail && ($head ? "$head/$tail" : "/mnt/hd/$tail");
 }
 
@@ -628,7 +628,7 @@ sub kdemove_desktop_file {
 #-###############################################################################
 #- auto_install stuff
 #-###############################################################################
-sub auto_inst_file() { ($::g_auto_install ? "/tmp" : "$::o->{prefix}/root/drakx") . "/auto_inst.cfg.pl" }
+sub auto_inst_file() { ($::g_auto_install ? "/tmp" : "$::prefix/root/drakx") . "/auto_inst.cfg.pl" }
 
 sub report_bug {
     my ($prefix) = @_;
-- 
cgit v1.2.1