From c820eaf34793284c03e45b0346d2deca18cb84b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Fri, 17 Oct 2008 13:47:20 +0000 Subject: 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. ........ --- Misc/NEWS | 2 ++ Tools/msi/msi.py | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index ede8e52..72b8073 100644 --- 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 022067c..d302688 100644 --- 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) -- cgit v0.12