summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2016-10-27 19:14:48 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2016-10-27 19:14:48 (GMT)
commit31c80e8eaef0fc06157caa5843ff211966f999d3 (patch)
tree145ca2d8604a280698de6aabe6a961dbed7a079e /Tools
parent43d2b264b99a79903ad1ce6fc38b46963e2db27d (diff)
downloadcpython-31c80e8eaef0fc06157caa5843ff211966f999d3.zip
cpython-31c80e8eaef0fc06157caa5843ff211966f999d3.tar.gz
cpython-31c80e8eaef0fc06157caa5843ff211966f999d3.tar.bz2
Revert incorrect file merge from 3.5.
Diffstat (limited to 'Tools')
-rw-r--r--Tools/msi/make_zip.proj2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/msi/make_zip.proj b/Tools/msi/make_zip.proj
index 13f75ba..d2e031f 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>