put the gdiplus.dll with the wx DLLs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index 9856bb32b1c34e86e5fd326b3ca8aa9d23149643..ecb97ce67b72bef12aa944ab967736c04eb5e491 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -75,7 +75,7 @@ Name: pthfile;  Description: "Make this install be the default wxPython"; Types:
 
 [Files]
 %(RTDLL)s
 
 [Files]
 %(RTDLL)s

-Source: "distrib\msw\gdiplus.dll"; DestDir: "{code:GetPythonDir}"; Check: OnlyBeforeXP; Flags: sharedfile; Components: core
+Source: "distrib\msw\gdiplus.dll"; DestDir: "{app}\%(PKGDIR)s\wx"; Check: OnlyBeforeXP; Flags: sharedfile; Components: core

 Source: "%(WXDIR)s\lib\vc_dll\wx*%(WXDLLVER)s_*.dll";  DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
 %(MSLU)s
 
 Source: "%(WXDIR)s\lib\vc_dll\wx*%(WXDLLVER)s_*.dll";  DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
 %(MSLU)s
 


@@ -698,7 +698,6 @@ def main():
         time.sleep(1)
         os.remove(ISSFILE)
         os.remove(ISSDEMOFILE)
         time.sleep(1)
         os.remove(ISSFILE)
         os.remove(ISSDEMOFILE)

-        os.remove(IFSFILE)

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------