[Python-modules-commits] [qscintilla2] 03/14: configure.py-objdir-support.diff

[Scott Kitterman]

This is an automated email from the git hooks/post-receive script.

kitterman pushed a commit to branch master
in repository qscintilla2.

commit 870cd1ddb387b6d8a1d2386b275d49b01222b74d
Author: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
Date:   Thu Oct 8 13:39:16 2015 -0700

    configure.py-objdir-support.diff
    
    02_configure.dpatch by Torsten Marek <shlomme at debian.org>
    Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
    <scott at kitterman.com>
    patch the configure script for the Python bindings to support object dir
    builds
    Patch-Name: configure.py-objdir-support.diff
---
 Python/configure.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Python/configure.py b/Python/configure.py
index a3af271..ec5ef61 100644
--- a/Python/configure.py
+++ b/Python/configure.py
@@ -37,6 +37,7 @@ import sys
 # You shouldn't need to modify anything above this line.
 ###############################################################################
 
+src_dir = os.path.dirname(os.path.abspath(__file__))
 
 # This must be kept in sync with Python/configure-old.py, qscintilla.pro,
 # example-Qt4Qt5/application.pro and designer-Qt4Qt5/designer.pro.
@@ -214,6 +215,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
@@ -268,7 +271,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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/qscintilla2.git