summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2015-10-28 15:59:40 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2015-10-28 22:05:17 +0800
commit6492ac6386d90fd840722e00c0eef9e24e09f9c2 (patch)
tree4d762865d9050ece4fe307fd3a41553db9d6e23c /tools
parent8fbfbf38a8bd9d06514f05ebb4e8cadcc1143d6a (diff)
downloadgobject-introspection-6492ac6386d90fd840722e00c0eef9e24e09f9c2.tar.gz
tools: Windows-re-enable 'relocatability' for tool template
The transition to Python 3.x compatibility accidentily removed the 'relocatability' support that was added, so re-enable this support on Windows again. https://bugzilla.gnome.org/show_bug.cgi?id=757126
Diffstat (limited to 'tools')
-rw-r--r--tools/g-ir-tool-template.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in
index 59f3ff47..f80730ec 100644
--- a/tools/g-ir-tool-template.in
+++ b/tools/g-ir-tool-template.in
@@ -31,8 +31,6 @@ if sys.version_info.major < 3:
else:
import builtins
-builtins.__dict__['DATADIR'] = "@datarootdir@"
-
debug = os.getenv('GI_SCANNER_DEBUG', '').split(',')
if debug:
if 'pydevd' in debug:
@@ -56,6 +54,8 @@ else:
datadir = "@datarootdir@"
pylibdir = os.path.join('@libdir@', 'gobject-introspection')
+builtins.__dict__['DATADIR'] = datadir
+
srcdir = os.getenv('UNINSTALLED_INTROSPECTION_SRCDIR', None)
if srcdir is not None:
pylibdir = srcdir