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

diff --git a/Misc/NEWS b/Misc/NEWS
index 9156c29cb8ec8060b9cf10bfe37048adc2fe43f6..d3f6456745a3ffb94e6c82d38d2e79339c0d75f8 100644 (file)
--- 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 e1addd9ed54e1cb25d4f70533005d6d8121f71ad..d576a4149aaf2d41aabd998f09a644fae06e5eb8 100644 (file)
--- 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>