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 7cae02dd96521cdc6c0c2ec41a84b6c5c18d1a12..4984693670790c350bca1e6b9e526290ac3552a2 100644 (file)
--- 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 e2ff6c17e9dd66b34ad1e3e43d353b3900ddfb19..87f918a689b71e50c703393cb26938a6e9b5eb28 100644 (file)
--- 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)