summaryrefslogtreecommitdiffstats
path: root/Tools/msi/msi.py
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-10-17 13:47:20 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-10-17 13:47:20 (GMT)
commitc820eaf34793284c03e45b0346d2deca18cb84b5 (patch)
tree3ab2cc21b4b2ea70021c60fe3560efc6317bc32b /Tools/msi/msi.py
parent34bbf006bd6e9783dd02065c0cf4746060692a8c (diff)
downloadcpython-c820eaf34793284c03e45b0346d2deca18cb84b5.zip
cpython-c820eaf34793284c03e45b0346d2deca18cb84b5.tar.gz
cpython-c820eaf34793284c03e45b0346d2deca18cb84b5.tar.bz2
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. ........
Diffstat (limited to 'Tools/msi/msi.py')
-rw-r--r--Tools/msi/msi.py4
1 files changed, 1 insertions, 3 deletions
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)