From 3fe995a0d38158e0ffde9772ed52fa87608ac084 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Mon, 8 Oct 2018 14:10:17 +0800 Subject: g-ir-tools: respect gir_dir_prefix Configure option gir_dir_prefix is used to configure install dir for .gir files, so add its value to include file search paths. Fix for flake8 and meson-test at same time. Signed-off-by: Kai Kang --- tools/g-ir-tool-template.in | 10 ++++++++++ tools/meson.build | 1 + 2 files changed, 11 insertions(+) (limited to 'tools') diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in index ed33d16b..b9cf0911 100755 --- a/tools/g-ir-tool-template.in +++ b/tools/g-ir-tool-template.in @@ -60,6 +60,16 @@ if not os.path.isdir(os.path.join(datadir, 'gir-1.0')): builtins.__dict__['DATADIR'] = datadir +# Respect gir_dir_prefix for meson and autotools +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@')) +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')) diff --git a/tools/meson.build b/tools/meson.build index 912eb6ba..b45ce668 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -20,6 +20,7 @@ foreach tool : tools tools_conf = configuration_data() tools_conf.set('libdir', libdir_abs) 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('TOOL_MODULE', tool[1]) -- cgit v1.2.1