summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rwxr-xr-xtools/g-ir-tool-template.in9
-rw-r--r--tools/meson.build5
2 files changed, 4 insertions, 10 deletions
diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in
index c4a10a28..75bf759c 100755
--- a/tools/g-ir-tool-template.in
+++ b/tools/g-ir-tool-template.in
@@ -53,14 +53,9 @@ if not os.path.isdir(os.path.join(datadir, 'gir-1.0')):
builtins.__dict__['DATADIR'] = datadir
-# Respect gir_dir_prefix for meson and autotools
+# Respect gir_dir_prefix
girdir = ''
-# for meson
-if '@gir_dir_prefix@' and not '@gir_dir_prefix@'.startswith('@'):
- girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@'))
-# for autotools
-elif '@GIR_DIR@' and not '@GIR_DIR@'.startswith('@'):
- girdir = os.path.dirname(os.path.abspath('@GIR_DIR@'))
+girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@'))
builtins.__dict__['GIRDIR'] = [girdir]
# Again, relative paths first so that the installation prefix is relocatable
diff --git a/tools/meson.build b/tools/meson.build
index 50641c19..f272c955 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -22,7 +22,6 @@ foreach tool : tools
tools_conf.set('datarootdir', datadir_abs)
tools_conf.set('gir_dir_prefix', gir_dir_prefix)
tools_conf.set('PYTHON_CMD', python_cmd)
- tools_conf.set('GIR_DIR', girdir)
tools_conf.set('TOOL_MODULE', tool[1])
tools_conf.set('TOOL_FUNCTION', tool[2])
@@ -34,7 +33,7 @@ foreach tool : tools
)
tool_output += tool_bin
# Provide tools for others when we're a subproject and they use the Meson GNOME module
- if not get_option('gi_cross_use_host_gi')
+ if not get_option('gi_cross_use_prebuilt_gi')
meson.override_find_program(tool[0], tool_bin)
endif
endforeach
@@ -76,7 +75,7 @@ girinspect = executable('g-ir-inspect', 'g-ir-inspect.c',
c_args: custom_c_args,
)
-if not get_option('gi_cross_use_host_gi')
+if not get_option('gi_cross_use_prebuilt_gi')
meson.override_find_program('g-ir-compiler', gircompiler)
meson.override_find_program('g-ir-generate', girgenerate)
meson.override_find_program('g-ir-inspect', girinspect)