summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-11-09 12:31:05 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2015-11-09 12:31:05 (GMT)
commit5e2e70029bdc9c52f9bb49f4cf207eb95c2da410 (patch)
treea33b517fce34b637ef22a015d031f274703a563a /Tools
parentd61d860ed3b231aab3e6084a6b4fca9768234440 (diff)
downloadcpython-5e2e70029bdc9c52f9bb49f4cf207eb95c2da410.zip
cpython-5e2e70029bdc9c52f9bb49f4cf207eb95c2da410.tar.gz
cpython-5e2e70029bdc9c52f9bb49f4cf207eb95c2da410.tar.bz2
Fixes installer not allowing launcher to be selected.
Diffstat (limited to 'Tools')
-rw-r--r--Tools/msi/bundle/bundle.wxs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs
index b8430a4..978efc0 100644
--- a/Tools/msi/bundle/bundle.wxs
+++ b/Tools/msi/bundle/bundle.wxs
@@ -26,7 +26,7 @@
<Variable Name="WinVerNoDot" Value="$(var.MajorVersionNumber)$(var.MinorVersionNumber)$(var.PyArchExt)$(var.PyTestExt)" />
<Variable Name="InstallAllUsers" Value="0" bal:Overridable="yes" />
- <?ifndef PyTestExt ?>
+ <?if "$(var.PyTestExt)"="" ?>
<Variable Name="InstallLauncherAllUsers" Value="1" bal:Overridable="yes" />
<?else ?>
<Variable Name="InstallLauncherAllUsers" Value="0" />
@@ -52,7 +52,7 @@
<Variable Name="DefaultCustomTargetDir" Value="" bal:Overridable="yes" />
<Variable Name="InstallAllUsersState" Value="enabled" />
- <?ifndef PyTestExt ?>
+ <?if "$(var.PyTestExt)"="" ?>
<Variable Name="InstallLauncherAllUsersState" Value="enabled" bal:Overridable="yes" />
<?else ?>
<Variable Name="InstallLauncherAllUsersState" Value="disable" bal:Overridable="yes" />
@@ -70,7 +70,7 @@
<Variable Name="Include_tools" Value="1" bal:Overridable="yes" />
<Variable Name="Include_tcltk" Value="1" bal:Overridable="yes" />
<Variable Name="Include_pip" Value="1" bal:Overridable="yes" />
- <?ifndef PyTestExt ?>
+ <?if "$(var.PyTestExt)"="" ?>
<Variable Name="Include_launcher" Value="1" bal:Overridable="yes" />
<?else ?>
<Variable Name="Include_launcher" Value="0" />