From 290dac8faf750a6528184e9ddf9837906fa40253 Mon Sep 17 00:00:00 2001 From: Debian Python Modules Team Date: Mon, 22 Sep 2014 03:09:22 +0100 Subject: [PATCH] configure.py-objdir-support 02_configure.dpatch by Torsten Marek Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman patch the configure script for the Python bindings to support object dir builds Gbp-Pq: Name configure.py-objdir-support.diff --- Python/configure.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Python/configure.py b/Python/configure.py index b18a911..927a98c 100644 --- a/Python/configure.py +++ b/Python/configure.py @@ -31,6 +31,8 @@ import os import glob import optparse +src_dir = os.path.dirname(os.path.abspath(__file__)) + try: import sysconfig except ImportError: @@ -210,6 +212,8 @@ class ModuleConfiguration(object): "The QScintilla version number could not be determined by " "reading %s." % sciglobal) + return # Debian: do not check for the installed version, we're good this way. + lib_dir = target_configuration.qsci_lib_dir if lib_dir is None: lib_dir = target_configuration.qt_lib_dir @@ -264,7 +268,12 @@ class ModuleConfiguration(object): the target configuration. """ - return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip' + if target_configuration.pyqt_package == 'PyQt5': + return os.path.join(src_dir, 'sip/qscimod5.sip') + else: + return os.path.join(src_dir, 'sip/qscimod4.sip') + + #return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip' def get_sip_installs(self, target_configuration): """ Return a tuple of the installation directory of the module's .sip -- 2.30.2