diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-09-12 12:40:19 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-09-12 12:40:19 +0000 |
| commit | 8e2d8066e8d07fa362e5c3414997d74e3cf6f8e4 (patch) | |
| tree | 72e4f2c03b722d07be9c4902df2f22493f131c6c | |
| parent | 85dc6a3f209a9224dd27f6f2de65d1ce0cd13c39 (diff) | |
| download | drakx-8e2d8066e8d07fa362e5c3414997d74e3cf6f8e4.tar drakx-8e2d8066e8d07fa362e5c3414997d74e3cf6f8e4.tar.gz drakx-8e2d8066e8d07fa362e5c3414997d74e3cf6f8e4.tar.bz2 drakx-8e2d8066e8d07fa362e5c3414997d74e3cf6f8e4.tar.xz drakx-8e2d8066e8d07fa362e5c3414997d74e3cf6f8e4.zip | |
fix when switching perl version.
| -rwxr-xr-x | perl-install/live_install2 | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/perl-install/live_install2 b/perl-install/live_install2 index 5fee58147..c9742231d 100755 --- a/perl-install/live_install2 +++ b/perl-install/live_install2 @@ -4,13 +4,22 @@ my $dir = `pwd`; chomp $dir; $dir .= "/../../.."; +#- perl version of the install, we use directly the version we found, +#- this means there SHOULD BE no module compiled for an older version of perl +#- which will be used by DrakX. +my ($version, $arch) = (glob "$dir/usr/lib/perl5/*/*/CORE/libperl.so")[0] =~ m|$dir/usr/lib/perl5/([^/]*)/([^/]*)/CORE/libperl.so|; + #- keep it mind the ELF loader to use. $ENV{LD_LOADER} = "$dir/lib/ld-linux.so.2"; $ENV{LOCPATH}="$dir/usr/share/locale"; $ENV{GCONV_PATH}="$dir/usr/lib/gconv"; -$ENV{PERL5LIB} = join ":", map { "$dir/$_" } @INC; -$ENV{LD_LIBRARY_PATH} = "$dir/usr/bin:$dir/bin:$dir/sbin:$dir/usr/sbin:$dir/usr/X11R6/bin:$dir/lib:$dir/usr/lib:$dir/usr/lib/perl5/5.6.0/i386-linux/CORE"; +$ENV{PERL5LIB} = join ":", map { "$dir/usr/lib/perl5/$_" } ("$version/$arch", + "$version", + "site_perl/$version/$arch", + "site_perl/$version", + "site_perl"); +$ENV{LD_LIBRARY_PATH} = "$dir/usr/bin:$dir/bin:$dir/sbin:$dir/usr/sbin:$dir/usr/X11R6/bin:$dir/lib:$dir/usr/lib:$dir/usr/lib/perl5/$version/$arch/CORE"; $ENV{PATH} = join(":", map { "$dir/$_" } split ":", "/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin") . ":$ENV{PATH}"; $ENV{SHARE_PATH} = "$dir/usr/share"; $ENV{RPMRC_FILE} = "$dir/usr/lib/rpm/rpmrc"; |