summaryrefslogtreecommitdiff
path: root/Master/install-tl.pl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2007-12-30 18:35:32 +0000
committerNorbert Preining <preining@logic.at>2007-12-30 18:35:32 +0000
commitb937bd9c2e26cee7cc8e757d3f9665121a559f29 (patch)
tree5d1c9447420ce1d7c5e6a40f4499a37c3d649f00 /Master/install-tl.pl
parent7632b341a7efc029d661a6943e292d1ec815f32d (diff)
implement Reinhard's suggestions:
- add a package bin-perltl.win32 which ships tlpkg/bin/perl.exe plus dll plus tlpkg/lib/... - adapt the installer that for win32 *always* bin-perltl.win32 is installed - adapt the installer that it uses the bin-perltl.win32 perl.exe for running updmap-sys.pl git-svn-id: svn://tug.org/texlive/trunk@6000 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl.pl')
-rwxr-xr-xMaster/install-tl.pl30
1 files changed, 9 insertions, 21 deletions
diff --git a/Master/install-tl.pl b/Master/install-tl.pl
index bb8892d3399..08e6b1956e8 100755
--- a/Master/install-tl.pl
+++ b/Master/install-tl.pl
@@ -276,14 +276,6 @@ sub set_texlive_default_dirs {
$vars{'TEXMFHOME'}="$texmfhome/texmf";
}
-sub is_useful_perl_installed {
- if (which("perl")) {
- return 1;
- } else {
- return 0;
- }
-}
-
sub calc_depends {
# we have to reset the install hash EVERY TIME otherwise everything will
# always be installed since the default is scheme-full which selects
@@ -309,8 +301,8 @@ sub calc_depends {
}
# we have to check for a decent perl installed
- if (!is_useful_perl_installed()) {
- $install{"bin-perl"} = 1;
+ if (win32()) {
+ $install{"bin-perltl.win32"} = 1;
}
# compute the list of archs to be installed
@@ -590,30 +582,26 @@ sub do_postinst_stuff {
}
$ENV{'PATH'} = "$path";
# Step 3: Make Perl find the right modules
- my $perlint = which("perl");
- if (dirname($perlint) =~ m;$vars{'TEXDIR'}/bin/$vars{'this_platform'};i) {
+ if (win32()) {
# 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";
+ if (defined($ENV{'PERL5LIB'})) {
+ $perllib = $ENV{'PERL5LIB'};
}
- $ENV{'PERLLIB'} = $perllib;
+ $perllib .= ";$vars{'TEXDIR'}/tlpkg/lib/Perl5_lib-TL_inst";
+ $ENV{'PERL5LIB'} = $perllib;
}
#
# Step 4: run the programs
`generate-fmtutil`;
`generate-updmap`;
`generate-language`;
+ my $perlint = "$vars{'TEXDIR'}/tlpkg/bin/perl.exe";
my $mktexlsr = (win32() ? "mktexlsr.exe" : "mktexlsr");
my $updmap = (win32() ? "$perlint $vars{'TEXDIR'}/bin/win32/updmap-sys.pl" : "updmap-sys");
`$mktexlsr $vars{'TEXDIR'}/texmf-dist $vars{'TEXDIR'}/texmf $vars{'TEXDIR'}/texmf-local`;
- `$updmap --nohash --cnffile=$vars{'TEXMFSYSVAR'}/web2c/updmap.cfg --dvipsoutputdir=$vars{'TEXMFSYSVAR'}/fonts/map/dvips/updmap \ --dvipdfmoutputdir=$vars{'TEXMFSYSVAR'}/fonts/map/dvipdfm/updmap --pdftexoutputdir=$vars{'TEXMFSYSVAR'}/fonts/map/pdftex/updmap `;
+ `$updmap --nohash`;
`$mktexlsr $vars{'TEXMFSYSVAR'}`;
# old installer: