summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rwxr-xr-xtools/g-ir-tool-template.in3
-rw-r--r--tools/meson.build3
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in
index 3b33f75d..8462f88a 100755
--- a/tools/g-ir-tool-template.in
+++ b/tools/g-ir-tool-template.in
@@ -61,7 +61,7 @@ if '@gir_dir_prefix@' and not '@gir_dir_prefix@'.startswith('@'):
# for autotools
elif '@GIR_DIR@' and not '@GIR_DIR@'.startswith('@'):
girdir = os.path.dirname(os.path.abspath('@GIR_DIR@'))
-builtins.__dict__['GIRDIR'] = girdir
+builtins.__dict__['GIRDIR'] = [girdir]
# Again, relative paths first so that the installation prefix is relocatable
pylibdir = os.path.abspath(os.path.join(filedir, '..', 'lib', 'gobject-introspection'))
@@ -85,6 +85,7 @@ if not os.path.isfile(os.path.join(pylibdir, 'giscanner', '_giscanner' + py_mod_
# We're running uninstalled inside meson
builddir = os.path.abspath(os.path.join(filedir, '..'))
pylibdir = builddir
+ builtins.__dict__['GIRDIR'].append(os.path.join(filedir, os.pardir, 'gir'))
gdump_path = os.path.join(builddir, 'girepository', 'gdump.c')
if os.path.isfile(gdump_path):
builtins.__dict__['GDUMP_PATH'] = gdump_path
diff --git a/tools/meson.build b/tools/meson.build
index 6cc3186a..1fedaa53 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -56,6 +56,7 @@ gircompiler = executable('g-ir-compiler', 'compiler.c',
install: true,
c_args: custom_c_args,
)
+meson.override_find_program('g-ir-compiler', gircompiler)
girgenerate = executable('g-ir-generate', 'generate.c',
dependencies: [
@@ -65,9 +66,11 @@ girgenerate = executable('g-ir-generate', 'generate.c',
install: true,
c_args: custom_c_args,
)
+meson.override_find_program('g-ir-generate', girgenerate)
girinspect = executable('g-ir-inspect', 'g-ir-inspect.c',
dependencies: girepo_dep,
install: true,
c_args: custom_c_args,
)
+meson.override_find_program('g-ir-inspect', girinspect) \ No newline at end of file