From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 3 Dec 2016 19:24:02 +0000 (-0800)
Subject: Issue #28846: Various installer fixes
X-Git-Tag: v3.6.0rc1~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1058109b3182522eaa4357ef99ad22b587d36c73;p=thirdparty%2FPython%2Fcpython.git

Issue #28846: Various installer fixes
---

1058109b3182522eaa4357ef99ad22b587d36c73
diff --cc Tools/msi/make_zip.proj
index d2e031f6b6ab,1af6dd2868a1..f78e6ffa28fb
--- a/Tools/msi/make_zip.proj
+++ b/Tools/msi/make_zip.proj
@@@ -13,10 -13,10 +13,10 @@@
          <SignOutput>false</SignOutput>
          <TargetName>python-$(PythonVersion)-embed-$(ArchName)</TargetName>
          <TargetExt>.zip</TargetExt>
-         <TargetPath>$(OutputPath)\en-us\$(TargetName)$(TargetExt)</TargetPath>
+         <TargetPath>$(OutputPath)\$(TargetName)$(TargetExt)</TargetPath>
          <CleanCommand>rmdir /q/s "$(IntermediateOutputPath)\zip_$(ArchName)"</CleanCommand>
          <Arguments>"$(PythonExe)" "$(MSBuildThisFileDirectory)\make_zip.py"</Arguments>
 -        <Arguments>$(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -b "$(BuildPath.TrimEnd('\'))"</Arguments>
 +        <Arguments>$(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -a $(ArchName)</Arguments>
          <Environment>set DOC_FILENAME=python$(PythonVersion).chm
  set VCREDIST_PATH=$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140.CRT</Environment>
      </PropertyGroup>