From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 16 Mar 2022 10:11:36 +0000 (-0700)
Subject: bpo-46948: Fix launcher installer build failure due to first part of fix (GH-31920... 
X-Git-Tag: v3.8.13~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b97cfdce8df9d0d455f65a22b1e0d34a29dc200;p=thirdparty%2FPython%2Fcpython.git

bpo-46948: Fix launcher installer build failure due to first part of fix (GH-31920) (GH-31924)

(cherry picked from commit 708812085355c92f32e547d1f1d1f29aefbbc27e)

Co-authored-by: Steve Dower <steve.dower@python.org>
---

diff --git a/Tools/msi/common.wxs b/Tools/msi/common.wxs
index d8f3cde99ab5..4554e80014a2 100644
--- a/Tools/msi/common.wxs
+++ b/Tools/msi/common.wxs
@@ -61,6 +61,7 @@
     </Fragment>
 
     <Fragment>
+        <?ifdef PythonExeComponentGuid ?>
         <!-- Locate TARGETDIR automatically assuming we have executables installed -->
         <Property Id="TARGETDIR">
             <ComponentSearch Id="PythonExe_Directory" Guid="$(var.PythonExeComponentGuid)">
@@ -69,6 +70,7 @@
                 </DirectorySearch>
             </ComponentSearch>
         </Property>
+        <?endif ?>
         <Property Id="DetectTargetDir" Value="1" />
     </Fragment>