Bug #1746880: Correctly install DLLs into system32 folder on Win64.

diff --git a/Misc/NEWS b/Misc/NEWS
index e5871cb1251347e86ce8a220f7bad55c7aeae0a0..9a0cab0f2c69b6ded446eac49db9f13b619ff859 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -113,6 +113,8 @@ Documentation
 Build
 -----
 
+- Bug #1746880: Correctly install DLLs into system32 folder on Win64.
+
 - Define _BSD_SOURCE, to get access to POSIX extensions on OpenBSD 4.1+.
 
 - Patch #1673122: Use an explicit path to libtool when building a framework. 

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 0229fb7bc79e6c38d5616efa1c2806de2eb88629..181c2eaa7385491965d40483a40d6f271be021ac 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -166,7 +166,7 @@ else:
     testprefix = ''
 
 if msilib.Win64:
-    SystemFolderName = "[SystemFolder64]"
+    SystemFolderName = "[System64Folder]"
 else:
     SystemFolderName = "[SystemFolder]"
 
@@ -877,7 +877,7 @@ def add_files(db):
     if not have_ctypes:
         print "WARNING: _ctypes.pyd not found, ctypes will not be included"
         extensions.remove("_ctypes.pyd")
-    
+
     # Add all .py files in Lib, except lib-tk, test
     dirs={}
     pydirs = [(root,"Lib")]