|
|
|
@ -583,6 +583,19 @@ class BuildKControlModule(Command):
|
|
|
|
|
self.announce("Using %s for Qt header files" % self.qt_inc_dir)
|
|
|
|
|
|
|
|
|
|
# Qt lib dir
|
|
|
|
|
if self.qt_lib_dir is None:
|
|
|
|
|
canidatepaths = []
|
|
|
|
|
qtdir = os.getenv("TQTDIR")
|
|
|
|
|
if qtdir != None:
|
|
|
|
|
canidatepaths.append(os.path.join(qtdir,get_libdir_name()))
|
|
|
|
|
canidatepaths.append(os.path.join(install.prefix,"lib/tqt3/"+get_libdir_name()))
|
|
|
|
|
canidatepaths.append(os.path.join(install.prefix,"lib/tqt3/"+get_libdir_name()))
|
|
|
|
|
canidatepaths.append(os.path.join(install.prefix,get_libdir_name()))
|
|
|
|
|
canidatepaths.append("/opt/tqt3/"+get_libdir_name())
|
|
|
|
|
canidatepaths.append("/opt/tqt/"+get_libdir_name())
|
|
|
|
|
canidatepaths.append("/opt/tqt/lib/"+get_libdir_name())
|
|
|
|
|
canidatepaths.append("/opt/tqt3/lib/"+get_libdir_name())
|
|
|
|
|
self.qt_lib_dir = FindFileInPaths('libtqt*',canidatepaths)
|
|
|
|
|
if self.qt_lib_dir is None:
|
|
|
|
|
canidatepaths = []
|
|
|
|
|
qtdir = os.getenv("QTDIR")
|
|
|
|
@ -1511,6 +1524,19 @@ class BuildKioslave(Command):
|
|
|
|
|
self.announce("Using %s for Qt header files" % self.qt_inc_dir)
|
|
|
|
|
|
|
|
|
|
# Qt lib dir
|
|
|
|
|
if self.qt_lib_dir is None:
|
|
|
|
|
canidatepaths = []
|
|
|
|
|
qtdir = os.getenv("TQTDIR")
|
|
|
|
|
if qtdir != None:
|
|
|
|
|
canidatepaths.append(os.path.join(qtdir,get_libdir_name()))
|
|
|
|
|
canidatepaths.append(os.path.join(install.prefix,"lib/tqt3/"+get_libdir_name()))
|
|
|
|
|
canidatepaths.append(os.path.join(install.prefix,"lib/tqt3/"+get_libdir_name()))
|
|
|
|
|
canidatepaths.append(os.path.join(install.prefix,get_libdir_name()))
|
|
|
|
|
canidatepaths.append("/opt/tqt3/"+get_libdir_name())
|
|
|
|
|
canidatepaths.append("/opt/tqt/"+get_libdir_name())
|
|
|
|
|
canidatepaths.append("/opt/tqt/lib/"+get_libdir_name())
|
|
|
|
|
canidatepaths.append("/opt/tqt3/lib/"+get_libdir_name())
|
|
|
|
|
self.qt_lib_dir = FindFileInPaths('libtqt*',canidatepaths)
|
|
|
|
|
if self.qt_lib_dir is None:
|
|
|
|
|
canidatepaths = []
|
|
|
|
|
qtdir = os.getenv("QTDIR")
|
|
|
|
|