configure.py-objdir-support

02_configure.dpatch by Torsten Marek <shlomme@debian.org>
Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
<scott@kitterman.com>
patch the configure script for the Python bindings to support object dir
builds

Gbp-Pq: Name configure.py-objdir-support.diff

diff --git a/Python/configure.py b/Python/configure.py
index b18a91102db6c9368ae39b20eeadb6a93af1f855..927a98c222c87a7c190d53175c0e0d5a244cf8df 100644 (file)
--- 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