From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 27 Oct 2016 19:14:48 +0000 (-0700)
Subject: Revert incorrect file merge from 3.5.
X-Git-Tag: v3.6.0b3~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31c80e8eaef0fc06157caa5843ff211966f999d3;p=thirdparty%2FPython%2Fcpython.git

Revert incorrect file merge from 3.5.
---

diff --git a/Tools/msi/make_zip.proj b/Tools/msi/make_zip.proj
index 13f75ba84931..d2e031f6b6ab 100644
--- a/Tools/msi/make_zip.proj
+++ b/Tools/msi/make_zip.proj
@@ -16,7 +16,7 @@
         <TargetPath>$(OutputPath)\en-us\$(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 "$(OutDir.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>