Hack to use whatever python directory is available

This will probably fail on systems with more than one python version installed
(cherry picked from commit a1e6b9dbf4)
v3.5.13-sru
Timothy Pearson 12 years ago committed by Slávek Banko
parent 2d8f982ef3
commit eb4b9cc7d8

@ -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'),
('pykde-dir=',None,'PyKDE 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.pykde_dir = None
self.data_dir = None
@ -1430,9 +1430,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'),
('pykde-dir=',None,'PyKDE module directory'),
('data-dir=',None,'installation directory for data (script) files')]
@ -1447,9 +1447,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.pykde_dir = None
self.data_dir = None

Loading…
Cancel
Save