diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-12-15 10:45:52 +0100 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2018-12-19 07:15:00 +0000 |
| commit | 3327be62d66f0f0c77631657543e791cbcd023a8 (patch) | |
| tree | 2f268aa2e16c3bad3bbe222cb243561ca779a7df | |
| parent | 22d5dcd1d1bc6368bb4a44a64f99c8c3cf2bab76 (diff) | |
| download | gobject-introspection-3327be62d66f0f0c77631657543e791cbcd023a8.tar.gz | |
build: extend PYTHONPATH instead of replacing it. Fixes #126
So we don't ignore any PYTHONPATH set by the user.
| -rw-r--r-- | common.mk | 4 | ||||
| -rwxr-xr-x | tests/gi-tester | 3 |
2 files changed, 4 insertions, 3 deletions
@@ -10,7 +10,7 @@ INTROSPECTION_SCANNER = \ env PATH=".libs:$(PATH)" \ LPATH=.libs \ CC="$(CC)" \ - PYTHONPATH=$(top_builddir):$(top_srcdir) \ + PYTHONPATH="$(top_builddir):$(top_srcdir):$(PYTHONPATH)" \ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \ $(top_builddir)/g-ir-scanner @@ -42,7 +42,7 @@ INTROSPECTION_COMPILER_ARGS = \ INTROSPECTION_DOCTOOL = \ env PATH=".libs:$(PATH)" \ LPATH=.libs \ - PYTHONPATH=$(top_builddir):$(top_srcdir) \ + PYTHONPATH="$(top_builddir):$(top_srcdir):$(PYTHONPATH)" \ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \ $(top_builddir)/g-ir-doc-tool diff --git a/tests/gi-tester b/tests/gi-tester index 98817d1d..1c92fe3a 100755 --- a/tests/gi-tester +++ b/tests/gi-tester @@ -111,7 +111,8 @@ def main(argv): filter( None, [os.environ.get("top_builddir"), - os.environ.get("top_srcdir")])) + os.environ.get("top_srcdir"), + os.environ.get("PYTHONPATH")])) subprocess.check_call([env["PYTHON"], targetname], env=env) else: raise SystemError("Unknown file type: %s" % targetbase) |