From 19da6add9230cf08178d407d13a9d6bbc281b1f3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 31 Dec 2011 15:08:05 -0600 Subject: [PATCH] Fix FTBFS in tde-guidance --- src/kdedistutils.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/kdedistutils.py b/src/kdedistutils.py index 908a130..03e6b9f 100644 --- a/src/kdedistutils.py +++ b/src/kdedistutils.py @@ -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")