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 ede8e520973d473b4862cee9c615788456aca279..72b807348d824a8efc53bf95d3546270cbcfe81c 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -67,6 +67,8 @@ Extension Modules
 Build
 -----
 
+- Issue #4091: Install pythonxy.dll in system32 again.
+
 - Issue #4018: Disable "for me" installations on Vista.
 
 Tools/Demos

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 022067c954dbc401956e53662eaa4d55e5f853e8..d30268881aeb7fe7e87f8299b6149c3d387cd06c 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -916,9 +916,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)