From 845f179db5ec240316f960c8c77b31a69aecc561 Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Thu, 30 Oct 2008 02:07:43 +0000 Subject: =?UTF-8?q?Bug=20558383=20=E2=80=93=20builddir=20!=3D=20srcdir=20b?= =?UTF-8?q?uild=20fails=20if=20giscanner=20python=20module?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2008-10-30 Johan Dahlin Bug 558383 – builddir != srcdir build fails if giscanner python module not already installed * gir/Makefile.am: construct PYTHONPATH just once * tests/everything/Makefile.am: * tests/scanner/Makefile.am: add $(top_srcdir) to PYTHONPATH to handle builddir != srcdir * giscanner/libtoolimporter.py: * giscanner/sourcescanner.py: Make the libtoolimporter work when distchecking too. Mostly based on patch by Tommi Komulainen svn path=/trunk/; revision=833 --- giscanner/sourcescanner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'giscanner/sourcescanner.py') diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py index 519a1d95..0e6aef58 100644 --- a/giscanner/sourcescanner.py +++ b/giscanner/sourcescanner.py @@ -186,7 +186,7 @@ class SourceScanner(object): def __init__(self): with LibtoolImporter: - from _giscanner import SourceScanner + from giscanner._giscanner import SourceScanner self._scanner = SourceScanner() self._filenames = [] self._cpp_options = [] -- cgit v1.2.1