View | Details | Raw Unified | Return to bug 14655
Collapse All | Expand All

(-)sip/siputils.py.orig (-7 lines)
Lines 371-382 class Makefile: Link Here
371
371
372
        rpaths = _UniqueList()
372
        rpaths = _UniqueList()
373
373
374
        for l in self.extra_lib_dirs:
375
            # Ignore relative directories.  This is really a hack to handle
376
            # SIP v3 inter-module linking.
377
            if os.path.dirname(l) not in ("", ".", ".."):
378
                rpaths.append(l)
379
380
        if self._python:
374
        if self._python:
381
            incdir.append(self.config.py_inc_dir)
375
            incdir.append(self.config.py_inc_dir)
382
            incdir.append(self.config.py_conf_inc_dir)
376
            incdir.append(self.config.py_conf_inc_dir)
Lines 518-524 class Makefile: Link Here
518
            # Handle library directories.
518
            # Handle library directories.
519
            libdir_qt = self.optional_list("LIBDIR_QT")
519
            libdir_qt = self.optional_list("LIBDIR_QT")
520
            libdir.extend(libdir_qt)
520
            libdir.extend(libdir_qt)
521
            rpaths.extend(libdir_qt)
522
521
523
            if self.config.qt_version >= 0x040000:
522
            if self.config.qt_version >= 0x040000:
524
                # For Windows: the macros that define the dependencies on
523
                # For Windows: the macros that define the dependencies on

Return to bug 14655