From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 12 Aug 2015 01:49:13 +0000 (-0700)
Subject: Issue #24847: Fixes tcltk installer layout of VC runtime DLL
X-Git-Tag: v3.6.0a1~1799^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b8a1fa0235cd48bb8acf446db70b26cca9f21a2;p=python

Issue #24847: Fixes tcltk installer layout of VC runtime DLL
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 9156c29cb8..d3f6456745 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #24847: Fixes tcltk installer layout of VC runtime DLL
+
 - Issue #24839: platform._syscmd_ver raises DeprecationWarning
 
 What's New in Python 3.5.0 release candidate 1?
diff --git a/Tools/msi/tcltk/tcltk.wixproj b/Tools/msi/tcltk/tcltk.wixproj
index e1addd9ed5..d576a4149a 100644
--- a/Tools/msi/tcltk/tcltk.wixproj
+++ b/Tools/msi/tcltk/tcltk.wixproj
@@ -28,9 +28,9 @@
             <Group>tcltk_dlls</Group>
         </InstallFiles>
         <InstallFiles Include="$(VCInstallDir)redist\$(Platform)\Microsoft.VC$(PlatformToolset.Substring(1)).CRT\vcruntime$(PlatformToolset.Substring(1)).dll">
-            <SourceBase>$(VCInstallDir)redist\$(Platform)\</SourceBase>
-            <Source>$(VCInstallDir)redist\$(Platform)\</Source>
-            <TargetBase>$(VCInstallDir)redist\$(Platform)\</TargetBase>
+            <SourceBase>$(VCInstallDir)redist\$(Platform)\Microsoft.VC$(PlatformToolset.Substring(1)).CRT\</SourceBase>
+            <Source>$(VCInstallDir)redist\$(Platform)\Microsoft.VC$(PlatformToolset.Substring(1)).CRT\</Source>
+            <TargetBase>$(VCInstallDir)redist\$(Platform)\Microsoft.VC$(PlatformToolset.Substring(1)).CRT\</TargetBase>
             <Target_>DLLs\</Target_>
             <Group>tcltk_dlls</Group>
         </InstallFiles>