From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 17 Oct 2008 13:43:01 +0000 (+0000)
Subject: Issue #4091: Install pythonxy.dll in system32 again.
X-Git-Tag: v2.7a1~2723
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f3e7697dcc6d091bb0792015dfe501bd41f25b4;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Misc/NEWS b/Misc/NEWS
index e583ff1174e6..54f6d39dfc69 100644
--- 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 707786e42284..517c4765aad6 100644
--- 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)