summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl17
1 files changed, 13 insertions, 4 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 875589cc949..b0cd3dddf1b 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1358,7 +1358,8 @@ sub do_path_adjustments {
my $ret = 0;
info ("running path adjustment actions\n");
if (win32()) {
- TeXLive::TLUtils::w32_add_to_path($vars{'TEXDIR'}.'/bin/win32',
+ my $subpath = win32() ? "win32" : "win64";
+ TeXLive::TLUtils::w32_add_to_path($vars{'TEXDIR'} . $subpath,
$vars{'tlpdbopt_w32_multi_user'});
broadcast_env();
} else {
@@ -1701,6 +1702,11 @@ sub calc_depends {
$install{"tlgs.win32"} = 1;
$install{"tlpsv.win32"} = 1;
}
+ if (grep(/^win64$/,@archs)) {
+ $install{"tlperl.win64"} = 1;
+ $install{"tlgs.win64"} = 1;
+ $install{"tlpsv.win64"} = 1;
+ }
# loop over all the packages until it is getting stable
my $changed = 1;
@@ -1727,12 +1733,15 @@ sub calc_depends {
foreach $a (@archs) {
$install{"$foo.$a"} = 1 if defined($tlpdb->get_package("$foo.$a"));
}
- } elsif ($p_dep =~ m/^(.*)\.win32$/) {
+ } elsif ($p_dep =~ m/^(.*)\.win(32|64)$/) {
# a win32 package should *only* be installed if we are installing
# the win32 arch
if (grep(/^win32$/,@archs)) {
$install{$p_dep} = 1;
}
+ if (grep(/^win64$/,@archs)) {
+ $install{$p_dep} = 1;
+ }
} else {
$install{$p_dep} = 1;
}
@@ -1889,7 +1898,7 @@ sub initialize_collections {
++$vars{'n_collections_selected'};
}
}
- if ($vars{"binary_win32"}) {
+ if ($vars{"binary_win32"} || $vars{"binary_win64"}) {
$vars{"collection-wintools"} = 1;
++$vars{'n_collections_selected'};
}
@@ -2446,7 +2455,7 @@ sub select_scheme {
# set to 1 only those which are required by the scheme
# since now scheme asks for collection-wintools we set its vars value
# to 1 in case we are installing win32 binaries
- if ($vars{"binary_win32"}) {
+ if ($vars{"binary_win32"} || $vars{"binary_win64"}) {
$vars{"collection-wintools"} = 1;
++$vars{'n_collections_selected'};
}