From: Steve Dower <steve.dower@microsoft.com>
Date: Mon, 9 Nov 2015 12:31:05 +0000 (-0500)
Subject: Fixes installer not allowing launcher to be selected.
X-Git-Tag: v3.6.0a1~1100^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e2e70029bdc9c52f9bb49f4cf207eb95c2da410;p=python

Fixes installer not allowing launcher to be selected.
---

diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs
index b8430a4058..978efc0a21 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" />