summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-05-23 18:27:15 +0000
committerThierry Vignaud <tv@mageia.org>2012-05-23 18:27:15 +0000
commitdec0e265a040825600d2e7b276cbcdaa517e0cee (patch)
tree02531c263cdd730d0e6efebbb995fbd3a08a76fe /perl-install
parent0871f6f667cf301c9973d14ab612456177789389 (diff)
downloaddrakx-dec0e265a040825600d2e7b276cbcdaa517e0cee.tar
drakx-dec0e265a040825600d2e7b276cbcdaa517e0cee.tar.gz
drakx-dec0e265a040825600d2e7b276cbcdaa517e0cee.tar.bz2
drakx-dec0e265a040825600d2e7b276cbcdaa517e0cee.tar.xz
drakx-dec0e265a040825600d2e7b276cbcdaa517e0cee.zip
/usr/X11R6 is now empty
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/install/install2.pm4
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 76ad7509b..787706332 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -792,7 +792,7 @@ sub writeandclean_ldsoconf {
my @l = chomp_(cat_($file));
my @default = ('/lib', '/usr/lib'); #- no need to have /lib and /usr/lib in ld.so.conf
- my @suggest = ('/usr/X11R6/lib', '/usr/lib/qt3/lib'); #- needed for upgrade where package renaming can cause this to disappear
+ my @suggest = ('/usr/lib/qt3/lib'); #- needed for upgrade where package renaming can cause this to disappear
if (arch() =~ /x86_64/) {
@default = map { $_, $_ . '64' } @default;
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 566a3ddc7..a3237267e 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -592,8 +592,8 @@ sub main {
mkdir $::prefix, 0755;
#- make sure we do not pick up any gunk from the outside world
- my $remote_path = "$::prefix/sbin:$::prefix/bin:$::prefix/usr/sbin:$::prefix/usr/bin:$::prefix/usr/X11R6/bin";
- $ENV{PATH} = "/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin:$remote_path";
+ my $remote_path = "$::prefix/sbin:$::prefix/bin:$::prefix/usr/sbin:$::prefix/usr/bin";
+ $ENV{PATH} = "/usr/bin:/bin:/sbin:/usr/sbin:$remote_path";
eval { install::any::spawnShell() };