From 3509b3c52608d043aa2fdeeffa0f4629c4c85b69 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 7 Jan 2008 07:07:17 +0000 Subject: fix calling of generate-* scripts in the do_postinst by using the installed perl interpreter on win32, and use the tlperl perl/lib git-svn-id: svn://tug.org/texlive/trunk@6068 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl.pl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'Master/install-tl.pl') diff --git a/Master/install-tl.pl b/Master/install-tl.pl index 03da25ed2af..33145d5f8cb 100755 --- a/Master/install-tl.pl +++ b/Master/install-tl.pl @@ -594,17 +594,18 @@ sub do_postinst_stuff { if (defined($ENV{'PERL5LIB'})) { $perllib = $ENV{'PERL5LIB'}; } - $perllib .= ";$vars{'TEXDIR'}/tlpkg/lib/Perl5_lib-TL_inst"; + $perllib .= ";$vars{'TEXDIR'}/tlpkg/tlperl/lib"; $ENV{'PERL5LIB'} = $perllib; } # # Step 4: run the programs - `generate-fmtutil`; - `generate-updmap`; - `generate-language`; - my $perlint = "$vars{'TEXDIR'}/tlpkg/bin/perl.exe"; - my $updmap = (win32() ? "$perlint $vars{'TEXDIR'}/bin/win32/updmap-sys.pl" : "updmap-sys"); + my $perlint = (win32() ? "$vars{'TEXDIR'}/tlpkg/tlperl/bin/perl.exe" : ""); + # for arch != win32 $perlint is empty so the usual perl invocation is done + `$perlint generate-fmtutil`; + `$perlint generate-updmap`; + `$perlint generate-language`; `mktexlsr $vars{'TEXDIR'}/texmf-dist $vars{'TEXDIR'}/texmf $vars{'TEXDIR'}/texmf-local`; + my $updmap = (win32() ? "$perlint $vars{'TEXDIR'}/bin/win32/updmap-sys.pl" : "updmap-sys"); `$updmap --nohash`; `mktexlsr $vars{'TEXMFSYSVAR'}`; -- cgit v1.2.3