diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:27:15 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:27:15 +0000 |
| commit | 046f28ef562faaaa06659fc20af8f20dcaf66c85 (patch) | |
| tree | 02531c263cdd730d0e6efebbb995fbd3a08a76fe | |
| parent | efa410738a3518faadb8a59467d1dfc42ae42ae0 (diff) | |
| download | drakx-backup-do-not-use-046f28ef562faaaa06659fc20af8f20dcaf66c85.tar drakx-backup-do-not-use-046f28ef562faaaa06659fc20af8f20dcaf66c85.tar.gz drakx-backup-do-not-use-046f28ef562faaaa06659fc20af8f20dcaf66c85.tar.bz2 drakx-backup-do-not-use-046f28ef562faaaa06659fc20af8f20dcaf66c85.tar.xz drakx-backup-do-not-use-046f28ef562faaaa06659fc20af8f20dcaf66c85.zip | |
/usr/X11R6 is now empty
| -rw-r--r-- | perl-install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/install2.pm | 4 |
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() }; |