From aa1e005d261ffa43ee4071ac79db97830eb8386d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Thu, 30 Aug 2007 18:37:41 +0000
Subject: [PATCH] Bug #1746880: Correctly install DLLs into system32 folder on
 Win64.

---
 Misc/NEWS        | 2 ++
 Tools/msi/msi.py | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index e5871cb1251..9a0cab0f2c6 100644
--- 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 0229fb7bc79..181c2eaa738 100644
--- 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")]