more test tweaks

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 4960145ec4d2a1decc30b5f6f5be622112bfe992..acdf11ef68a0d7070b28a2ac3484261782ad2089 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -368,7 +368,7 @@ if BUILD_GLCANVAS:
 
     gl_libs = []
     if os.name == 'posix':
-        gl_config = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1]
+        gl_config = os.popen(WX_CONFIG + ' --libs gl', 'r').read()[:-1]
         gl_lflags = gl_config.split() + lflags
         gl_libs = libs
     else:
@@ -435,7 +435,7 @@ if BUILD_STC:
     if os.name == 'nt':
         STC_H = opj(WXDIR, 'contrib', 'include/wx/stc')
     else:
-        STC_H = opj(WXPREFIX, 'include/wx/stc')
+        STC_H = opj(WXPREFIX, 'include/wx-%d.%d/wx/stc' % (VER_MAJOR, VER_MINOR))
 
 ## NOTE: need to add something like this to the stc.bkl...
 
@@ -671,8 +671,9 @@ else:
               glob.glob(opj("src/_*.py")) + \
               glob.glob(opj("src/*.swg"))
 
-    HEADERS = zip(h_files, ["/include/wx/wxPython"]*len(h_files)) + \
-              zip(i_files, ["/include/wx/wxPython/i_files"]*len(i_files))
+    HEADERS = zip(h_files, ["/wxPython"]*len(h_files)) + \
+              zip(i_files, ["/wxPython/i_files"]*len(i_files))
+
 
 #----------------------------------------------------------------------
 # Do the Setup/Build/Install/Whatever
@@ -705,6 +706,7 @@ if __name__ == "__main__":
                           'wx.lib',
                           'wx.lib.colourchooser',
                           'wx.lib.editor',
+                          'wx.lib.floatcanvas',
                           'wx.lib.masked',
                           'wx.lib.mixins',
                           'wx.lib.ogl',