diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-24 15:21:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-24 15:21:14 -0600 |
| commit | df035ca4b32ff0ff0330e7c1496a21defe65bedd (patch) | |
| tree | f0b465912737f4f2208ee07fed5ad1d2a301f20f | |
| parent | b0b077a020ef55cb7e3db974262610b39ff5b038 (diff) | |
| download | pytdeextensions-df035ca4.tar.gz pytdeextensions-df035ca4.zip | |
Fix FTBFS
| -rw-r--r-- | src/kdedistutils.py | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/src/kdedistutils.py b/src/kdedistutils.py index d2c38c5..b1383f6 100644 --- a/src/kdedistutils.py +++ b/src/kdedistutils.py @@ -567,19 +567,23 @@ class BuildKControlModule(Command): qtdir = os.getenv("QTDIR") if qtdir != None: canidatepaths.append(os.path.join(qtdir,"include")) - canidatepaths.append(os.path.join(install.prefix,"lib/qt3/include")) + canidatepaths.append(os.path.join(install.prefix,"lib/tqt3/include")) canidatepaths.append(os.path.join(install.prefix,"lib/qt3/include")) canidatepaths.append(os.path.join(install.prefix,"include")) - canidatepaths.append("/opt/qt3/include") + canidatepaths.append("/opt/tqt3/include") canidatepaths.append("/opt/qt/include") canidatepaths.append("/opt/qt/lib/include") canidatepaths.append("/opt/qt3/lib/include") + canidatepaths.append("/usr/include/tqt3") canidatepaths.append("/usr/include/qt3") + self.qt_inc_dir = FindFileInPaths('ntqstring.h',canidatepaths) + if self.qt_inc_dir is None: self.qt_inc_dir = FindFileInPaths('qstring.h',canidatepaths) if self.qt_inc_dir is None: raise SystemExit,"Failed to find the Qt header file directory" - if FindFileInPaths('qstring.h',[self.qt_inc_dir]) is None: - raise SystemExit, "Failed to find Qt header files in: %s" % self.qt_inc_dir + if FindFileInPaths('ntqstring.h',[self.qt_inc_dir]) is None: + if FindFileInPaths('qstring.h',[self.qt_inc_dir]) is None: + raise SystemExit, "Failed to find Qt header files in: %s" % self.qt_inc_dir self.announce("Using %s for Qt header files" % self.qt_inc_dir) # Qt lib dir @@ -601,10 +605,10 @@ class BuildKControlModule(Command): qtdir = os.getenv("QTDIR") if qtdir != None: canidatepaths.append(os.path.join(qtdir,get_libdir_name())) - canidatepaths.append(os.path.join(install.prefix,"lib/qt3/"+get_libdir_name())) + canidatepaths.append(os.path.join(install.prefix,"lib/tqt3/"+get_libdir_name())) canidatepaths.append(os.path.join(install.prefix,"lib/qt3/"+get_libdir_name())) canidatepaths.append(os.path.join(install.prefix,get_libdir_name())) - canidatepaths.append("/opt/qt3/"+get_libdir_name()) + canidatepaths.append("/opt/tqt3/"+get_libdir_name()) canidatepaths.append("/opt/qt/"+get_libdir_name()) canidatepaths.append("/opt/qt/lib/"+get_libdir_name()) canidatepaths.append("/opt/qt3/lib/"+get_libdir_name()) @@ -862,7 +866,7 @@ class BuildKControlModule(Command): #include <klibloader.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> -#include <qstring.h> +#include <tqstring.h> #include <sip.h> #define MODULE_DIR "%(moduledir)s" @@ -1509,18 +1513,21 @@ class BuildKioslave(Command): qtdir = os.getenv("QTDIR") if qtdir != None: canidatepaths.append(os.path.join(qtdir,"include")) - canidatepaths.append(os.path.join(install.prefix,"lib/qt3/include")) + canidatepaths.append(os.path.join(install.prefix,"lib/tqt3/include")) canidatepaths.append(os.path.join(install.prefix,"lib/qt3/include")) canidatepaths.append(os.path.join(install.prefix,"include")) - canidatepaths.append("/opt/qt3/include") + canidatepaths.append("/opt/tqt3/include") canidatepaths.append("/opt/qt/include") canidatepaths.append("/opt/qt/lib/include") canidatepaths.append("/opt/qt3/lib/include") + self.qt_inc_dir = FindFileInPaths('ntqstring.h',canidatepaths) + if self.qt_inc_dir is None: self.qt_inc_dir = FindFileInPaths('qstring.h',canidatepaths) if self.qt_inc_dir is None: raise SystemExit,"Failed to find the Qt header file directory" - if FindFileInPaths('qstring.h',[self.qt_inc_dir]) is None: - raise SystemExit, "Failed to find Qt header files in: %s" % self.qt_inc_dir + if FindFileInPaths('ntqstring.h',[self.qt_inc_dir]) is None: + if FindFileInPaths('qstring.h',[self.qt_inc_dir]) is None: + raise SystemExit, "Failed to find Qt header files in: %s" % self.qt_inc_dir self.announce("Using %s for Qt header files" % self.qt_inc_dir) # Qt lib dir @@ -1542,10 +1549,10 @@ class BuildKioslave(Command): qtdir = os.getenv("QTDIR") if qtdir != None: canidatepaths.append(os.path.join(qtdir,get_libdir_name())) - canidatepaths.append(os.path.join(install.prefix,"lib/qt3/"+get_libdir_name())) + canidatepaths.append(os.path.join(install.prefix,"lib/tqt3/"+get_libdir_name())) canidatepaths.append(os.path.join(install.prefix,"lib/qt3/"+get_libdir_name())) canidatepaths.append(os.path.join(install.prefix,get_libdir_name())) - canidatepaths.append("/opt/qt3/"+get_libdir_name()) + canidatepaths.append("/opt/tqt3/"+get_libdir_name()) canidatepaths.append("/opt/qt/"+get_libdir_name()) canidatepaths.append("/opt/qt/lib/"+get_libdir_name()) canidatepaths.append("/opt/qt3/lib/"+get_libdir_name()) |