[Commits] (morgen) Applying a fix that was made to the wxwidgets.org CVS last week.

commits at osafoundation.org commits at osafoundation.org
Wed Apr 14 10:19:09 PDT 2004


Commit by: morgen
Modified files:
wxPythonSrc-2.5.1.5/wxPython/config.py 2.4 2.5

Log message:
Applying a fix that was made to the wxwidgets.org CVS last week.


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/wxPythonSrc-2.5.1.5/wxPython/config.py.diff?r1=text&tr1=2.4&r2=text&tr2=2.5

Index: wxPythonSrc-2.5.1.5/wxPython/config.py
diff -u wxPythonSrc-2.5.1.5/wxPython/config.py:2.4 wxPythonSrc-2.5.1.5/wxPython/config.py:2.5
--- wxPythonSrc-2.5.1.5/wxPython/config.py:2.4	Sun Apr 11 11:51:11 2004
+++ wxPythonSrc-2.5.1.5/wxPython/config.py	Wed Apr 14 10:18:38 2004
@@ -15,7 +15,7 @@
 # Author:      Robin Dunn
 #
 # Created:     23-March-2004
-# RCS-ID:      $Id: config.py,v 2.4 2004/04/11 18:51:11 john Exp $
+# RCS-ID:      $Id: config.py,v 2.5 2004/04/14 17:18:38 morgen Exp $
 # Copyright:   (c) 2004 by Total Control Software
 # Licence:     wxWindows license
 #----------------------------------------------------------------------
@@ -407,11 +407,9 @@
         if not headers:
             return
 
-        # root = self.root
-        # if WXPREFIX.startswith(root):
-        #     root = ''
-
-        root = ''
+        root = self.root
+        if root is None or WXPREFIX.startswith(root):
+            root = ''
         for header, location in headers:
             install_dir = os.path.normpath(root + WXPREFIX + location)
             self.mkpath(install_dir)



More information about the Commits mailing list