Issue #4091: Install pythonxy.dll in system32 again.

diff --git a/Misc/NEWS b/Misc/NEWS
index e583ff1174e656c23346b3a411d4ec6978a1642b..54f6d39dfc6950c37857b655a04165424bb6aa84 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,8 @@ Library
 Build
 -----
 
+- Issue #4091: Install pythonxy.dll in system32 again.
+
 - Issue #4018: Disable "for me" installations on Vista.
 
 - Issue #3758: Add ``patchcheck`` build target to .PHONY.

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 707786e42284ead618c8a76800086404770d5882..517c4765aad686f9821f3ab33e01d8816b95af99 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -915,9 +915,7 @@ def add_files(db):
     root.add_file("%s/pythonw.exe" % PCBUILD)
 
     # msidbComponentAttributesSharedDllRefCount = 8, see "Component Table"
-    #dlldir = PyDirectory(db, cab, root, srcdir, "DLLDIR", ".")
-    #install python30.dll into root dir for now
-    dlldir = root
+    dlldir = PyDirectory(db, cab, root, srcdir, "DLLDIR", ".")
 
     pydll = "python%s%s.dll" % (major, minor)
     pydllsrc = os.path.join(srcdir, PCBUILD, pydll)