[Python-checkins] r57754 - in python/branches/release25-maint: Misc/NEWS Tools/msi/msi.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Thu Aug 30 20:37:41 2007
New Revision: 57754

Modified:
   python/branches/release25-maint/Misc/NEWS
   python/branches/release25-maint/Tools/msi/msi.py
Log:
Bug #1746880: Correctly install DLLs into system32 folder on Win64.

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Thu Aug 30 20:37:41 2007
@@ -113,6 +113,8 @@
 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. 

Modified: python/branches/release25-maint/Tools/msi/msi.py
==============================================================================
--- python/branches/release25-maint/Tools/msi/msi.py	(original)
+++ python/branches/release25-maint/Tools/msi/msi.py	Thu Aug 30 20:37:41 2007
@@ -166,7 +166,7 @@
     testprefix = ''
 
 if msilib.Win64:
-    SystemFolderName = "[SystemFolder64]"
+    SystemFolderName = "[System64Folder]"
 else:
     SystemFolderName = "[SystemFolder]"
 
@@ -877,7 +877,7 @@
     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")]