From 974f3c7d0f2e23b82ca0eb45514c745b07fdbe66 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 11 Dec 2007 10:02:35 +0000 Subject: get installation on win32 running .... yeah git-svn-id: svn://tug.org/texlive/trunk@5758 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl.pl | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'Master/install-tl.pl') diff --git a/Master/install-tl.pl b/Master/install-tl.pl index 3cef3f61489..c8b1471689d 100755 --- a/Master/install-tl.pl +++ b/Master/install-tl.pl @@ -36,7 +36,7 @@ use TeXLive::TLUtils qw(initialize_installer media platform platform_desc debug which getenv win32 unix program_exists architectures_available additional_architectures_available_from_net get_system_tmpdir member mkdirhier make_var_skeleton make_local_skeleton install_package copy - create_fmtutil create_updmap create_language install_packages); + create_fmtutil create_updmap create_language install_packages dirname); use TeXLive::TLPOBJ; use TeXLive::TLPDB; use TeXLive::TLConfig qw($DefaultContainerExtension $InfraLocation); @@ -564,6 +564,7 @@ sub do_postinst_stuff { # we have to do several things: # - clean the environment from spurious TEXMF related variables # - add the bin dir to the PATH + # - select perl interpreter and set the correct perllib # - run the programs # # Step 1: Clean the environment @@ -585,7 +586,24 @@ sub do_postinst_stuff { $path = "$vars{'TEXDIR'}/bin/$vars{'this_platform'}:$path"; } $ENV{'PATH'} = "$path"; - # Step 3: run the programs + # Step 3: Make Perl find the right modules + my $perlint = which("perl"); + if (dirname($perlint) =~ m;$vars{'TEXDIR'}/bin/$vars{'this_platform'};i) { + # we are working with our version of perl + # thus, we have to set the PERLLIB envvar right + my $perllib = ""; + if (defined($ENV{'PERLLIB'})) { + $perllib = $ENV{'PERLLIB'}; + } + if (win32()) { + $perllib .= ";$vars{'TEXDIR'}/perltl/lib"; + } else { + $perllib .= ":$vars{'TEXDIR'}/perltl/lib"; + } + $ENV{'PERLLIB'} = $perllib; + } + # + # Step 4: run the programs my $mktexlsr = (win32() ? "mktexlsr.exe" : "mktexlsr"); my $updmap = (win32() ? "updmap.exe" : "updmap-sys"); `$mktexlsr $vars{'TEXDIR'}/texmf-dist $vars{'TEXDIR'}/texmf $vars{'TEXDIR'}/texmf-local`; -- cgit v1.2.3