Contents of /trunk/pyqt/patches/pyqt-3.16-mkspec-loc-fix.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 988 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 988 byte(s)
-import
1 | diff -Naur PyQt-x11-gpl-3.16/configure.py PyQt-x11-gpl-3.16.patched/configure.py |
2 | --- PyQt-x11-gpl-3.16/configure.py 2006-03-25 01:09:06.000000000 +0100 |
3 | +++ PyQt-x11-gpl-3.16.patched/configure.py 2006-07-08 20:56:33.000000000 +0200 |
4 | @@ -1026,9 +1026,9 @@ |
5 | """ |
6 | # Get the name of the qmake configuration file to take the macros from. |
7 | if "QMAKESPEC" in os.environ.keys(): |
8 | - fname = os.path.join(qt_dir, "mkspecs", os.environ["QMAKESPEC"], "qmake.conf") |
9 | + fname = os.path.join(os.environ["QTDATADIR"], "mkspecs", os.environ["QMAKESPEC"], "qmake.conf") |
10 | else: |
11 | - fname = os.path.join(qt_dir, "mkspecs", "default", "qmake.conf") |
12 | + fname = os.path.join(os.environ["QTDATADIR"], "mkspecs", "default", "qmake.conf") |
13 | |
14 | if not os.access(fname, os.F_OK): |
15 | sipconfig.error("Unable to find the default configuration file %s. You can use the QMAKESPEC environment variable to specify the correct platform instead of \"default\"." % fname) |