summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-02-15 16:59:51 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-02-15 16:59:51 +0000
commit2c0ddd59eef561bfb4af9cec1d42897a03112f52 (patch)
treec4b2706c28f940405f9b96e472d9b59dbdff3c8b
parentad172199eda4e6ca5f5ffbabe4d9de948a2486a6 (diff)
downloaddrakx-2c0ddd59eef561bfb4af9cec1d42897a03112f52.tar
drakx-2c0ddd59eef561bfb4af9cec1d42897a03112f52.tar.gz
drakx-2c0ddd59eef561bfb4af9cec1d42897a03112f52.tar.bz2
drakx-2c0ddd59eef561bfb4af9cec1d42897a03112f52.tar.xz
drakx-2c0ddd59eef561bfb4af9cec1d42897a03112f52.zip
(main): set SHARE_PATH to /export/Mandrake/mdkinst/usr/share if it exists
-rw-r--r--perl-install/install2.pm8
1 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index b62511da0..f1464ce1e 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -372,7 +372,6 @@ sub main {
require install_steps_auto_install;
install_steps_auto_install::errorInStep();
};
- $ENV{SHARE_PATH} ||= "/usr/share";
$ENV{PERL_BADLANG} = 1;
$::isInstall = 1;
@@ -437,6 +436,13 @@ sub main {
}}{lc $n}; &$f if $f;
} %cmdline;
+ if ($::testing) {
+ $ENV{SHARE_PATH} ||= "/export/Mandrake/mdkinst/usr/share";
+ $ENV{SHARE_PATH} = "/usr/share" if !-e $ENV{SHARE_PATH};
+ } else {
+ $ENV{SHARE_PATH} ||= "/usr/share";
+ }
+
undef $::auto_install if $cfg;
if ($::g_auto_install) {
(my $root = `/bin/pwd`) =~ s|(/[^/]*){5}$||;