From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 17 Oct 2008 13:43:58 +0000 (+0000)
Subject: Merged revisions 66958 via svnmerge from
X-Git-Tag: v2.6.1~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f3ccbe33e1dfb0b38ed17aa9dca1cfacdc1eea0;p=python

Merged revisions 66958 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66958 | martin.v.loewis | 2008-10-17 15:43:01 +0200 (Fr, 17 Okt 2008) | 1 line

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

diff --git a/Misc/NEWS b/Misc/NEWS
index 7cae02dd96..4984693670 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,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 e2ff6c17e9..87f918a689 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -914,9 +914,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)