From a1e6b9dbf4e821288483440ab467c9b0c981b49d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 May 2012 22:55:20 -0500 Subject: [PATCH] Hack to use whatever python directory is available This will probably fail on systems with more than one python version installed --- src/kdedistutils.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/kdedistutils.py b/src/kdedistutils.py index 3cac4f8..ea79992 100644 --- a/src/kdedistutils.py +++ b/src/kdedistutils.py @@ -502,9 +502,9 @@ class BuildKControlModule(Command): ('kde-kcm-lib-dir=',None,'Directory for KDE kcm library files'), ('qt-inc-dir=',None,'Directory containing C++ header files for Qt'), ('qt-lib-dir=',None,'Directory containing library files for Qt'), - ('sip-dir=','/usr/lib/pyshared/python2.6','Directory containing the sip library files'), + ('sip-dir=','/usr/lib/pyshared/python*','Directory containing the sip library files'), ('clib=',None,'gcc library and path'), - ('pyqt-dir=','/usr/lib/pyshared/python2.6','PyQt module directory'), + ('pyqt-dir=','/usr/lib/pyshared/python*','PyQt module directory'), ('pytde-dir=',None,'PyTDE module directory'), ('data-dir=',None,'installation directory for data (script) files')] @@ -518,9 +518,9 @@ class BuildKControlModule(Command): self.kde_kcm_lib_dir = None self.qt_inc_dir = None self.qt_lib_dir = None - self.sip_dir = "/usr/lib/pyshared/python2.6" + self.sip_dir = "/usr/lib/pyshared/python*" self.clib = None - self.pyqt_dir = "/usr/lib/pyshared/python2.6" + self.pyqt_dir = "/usr/lib/pyshared/python*" self.pytde_dir = None self.data_dir = None @@ -1447,9 +1447,9 @@ class BuildKioslave(Command): ('kde-protocol-dir=',None,'Directory for KDE kioslave protocol files'), ('qt-inc-dir=',None,'Directory containing C++ header files for Qt'), ('qt-lib-dir=',None,'Directory containing library files for Qt'), - ('sip-dir=','/usr/lib/pyshared/python2.6','Directory containing the sip library files'), + ('sip-dir=','/usr/lib/pyshared/python*','Directory containing the sip library files'), ('clib=',None,'gcc library and path'), - ('pyqt-dir=','/usr/lib/pyshared/python2.6','PyQt module directory'), + ('pyqt-dir=','/usr/lib/pyshared/python*','PyQt module directory'), ('pytde-dir=',None,'PyTDE module directory'), ('data-dir=',None,'installation directory for data (script) files')] @@ -1464,9 +1464,9 @@ class BuildKioslave(Command): self.kde_protocol_dir = None self.qt_inc_dir = None self.qt_lib_dir = None - self.sip_dir = "/usr/lib/pyshared/python2.6" + self.sip_dir = "/usr/lib/pyshared/python*" self.clib = None - self.pyqt_dir = "/usr/lib/pyshared/python2.6" + self.pyqt_dir = "/usr/lib/pyshared/python*" self.pytde_dir = None self.data_dir = None