summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/tdedistutils.py32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/tdedistutils.py b/src/tdedistutils.py
index fa14021..8d8278f 100644
--- a/src/tdedistutils.py
+++ b/src/tdedistutils.py
@@ -591,9 +591,9 @@ class BuildKControlModule(Command):
# Qt lib dir
if self.qt_lib_dir is None:
canidatepaths = []
- qtlib = os.getenv("TQTLIB")
- if qtlib != None:
- canidatepaths.append(qtlib)
+ tqtlib = os.getenv("TQTLIB")
+ if tqtlib != None:
+ canidatepaths.append(tqtlib)
qtdir = os.getenv("TQTDIR")
if qtdir != None:
canidatepaths.append(os.path.join(qtdir,get_libdir_name()))
@@ -607,9 +607,9 @@ class BuildKControlModule(Command):
self.qt_lib_dir = FindFileInPaths('libtqt*',canidatepaths)
if self.qt_lib_dir is None:
canidatepaths = []
- qtlib = os.getenv("QTLIB")
- if qtlib != None:
- canidatepaths.append(qtlib)
+ tqtlib = os.getenv("TQTLIB")
+ if tqtlib != None:
+ canidatepaths.append(tqtlib)
qtdir = os.getenv("QTDIR")
if qtdir != None:
canidatepaths.append(os.path.join(qtdir,get_libdir_name()))
@@ -620,7 +620,7 @@ class BuildKControlModule(Command):
canidatepaths.append("/opt/qt/"+get_libdir_name())
canidatepaths.append("/opt/qt/lib/"+get_libdir_name())
canidatepaths.append("/opt/qt3/lib/"+get_libdir_name())
- self.qt_lib_dir = FindFileInPaths('libqt*',canidatepaths)
+ self.qt_lib_dir = FindFileInPaths('libtqt*',canidatepaths)
if self.qt_lib_dir is None:
raise SystemExit, "Failed to find Qt library files"
self.announce("Using %s for Qt library files" % self.qt_lib_dir)
@@ -641,7 +641,7 @@ class BuildKControlModule(Command):
self.pyqt_dir = FindFileInPaths("python_tqt", sys.path)
if self.pyqt_dir is None:
self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'python_tqt')
- if (FindFileInPaths("libqtcmodule*",[self.pyqt_dir]) is None) and (FindFileInPaths("qt*",[self.pyqt_dir]) is None):
+ if (FindFileInPaths("libtqtcmodule*",[self.pyqt_dir]) is None) and (FindFileInPaths("qt*",[self.pyqt_dir]) is None):
raise SystemExit, "Failed to find the PyQt directory: %s" % self.pyqt_dir
self.announce("Using %s for PyQt modules" % self.pyqt_dir)
@@ -1546,9 +1546,9 @@ class BuildTdeioslave(Command):
# Qt lib dir
if self.qt_lib_dir is None:
canidatepaths = []
- qtlib = os.getenv("TQTLIB")
- if qtlib != None:
- canidatepaths.append(qtlib)
+ tqtlib = os.getenv("TQTLIB")
+ if tqtlib != None:
+ canidatepaths.append(tqtlib)
qtdir = os.getenv("TQTDIR")
if qtdir != None:
canidatepaths.append(os.path.join(qtdir,get_libdir_name()))
@@ -1562,9 +1562,9 @@ class BuildTdeioslave(Command):
self.qt_lib_dir = FindFileInPaths('libtqt*',canidatepaths)
if self.qt_lib_dir is None:
canidatepaths = []
- qtlib = os.getenv("QTLIB")
- if qtlib != None:
- canidatepaths.append(qtlib)
+ tqtlib = os.getenv("TQTLIB")
+ if tqtlib != None:
+ canidatepaths.append(tqtlib)
qtdir = os.getenv("QTDIR")
if qtdir != None:
canidatepaths.append(os.path.join(qtdir,get_libdir_name()))
@@ -1575,7 +1575,7 @@ class BuildTdeioslave(Command):
canidatepaths.append("/opt/qt/"+get_libdir_name())
canidatepaths.append("/opt/qt/lib/"+get_libdir_name())
canidatepaths.append("/opt/qt3/lib/"+get_libdir_name())
- self.qt_lib_dir = FindFileInPaths('libqt*',canidatepaths)
+ self.qt_lib_dir = FindFileInPaths('libtqt*',canidatepaths)
if self.qt_lib_dir is None:
raise SystemExit, "Failed to find Qt library files"
self.announce("Using %s for Qt library files" % self.qt_lib_dir)
@@ -1596,7 +1596,7 @@ class BuildTdeioslave(Command):
self.pyqt_dir = FindFileInPaths("python_tqt", sys.path)
if self.pyqt_dir is None:
self.pyqt_dir = os.path.join(sysconfig.get_python_lib(), 'python_tqt')
- if (FindFileInPaths("libqtcmodule*",[self.pyqt_dir]) is None) and (FindFileInPaths("qt*",[self.pyqt_dir]) is None):
+ if (FindFileInPaths("libtqtcmodule*",[self.pyqt_dir]) is None) and (FindFileInPaths("qt*",[self.pyqt_dir]) is None):
raise SystemExit, "Failed to find the PyQt directory: %s" % self.pyqt_dir
self.announce("Using %s for PyQt modules" % self.pyqt_dir)