1From b01b448613b76f9acefdfd89ee01686dc7a67df4 Mon Sep 17 00:00:00 2001 2From: Chen Qi <Qi.Chen@windriver.com> 3Date: Tue, 13 Jul 2021 02:05:11 -0700 4Subject: [PATCH] g-ir-tool-template.in: fix girdir path 5 6In case gir_dir_prefix is set, it's possible that g-ir-scanner 7cannot find the .gir files. This is because that the girdir 8is set to gir_dir_prefix, which is wrong. It's not a prefix, 9it the actual gir dir. 10 11Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/329] 12 13Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 14--- 15 tools/g-ir-tool-template.in | 2 +- 16 1 file changed, 1 insertion(+), 1 deletion(-) 17 18diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in 19index 6e98f52e..62c07c31 100755 20--- a/tools/g-ir-tool-template.in 21+++ b/tools/g-ir-tool-template.in 22@@ -55,7 +55,7 @@ builtins.__dict__['DATADIR'] = datadir 23 24 # Respect gir_dir_prefix 25 girdir = '' 26-girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@')) 27+girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@', 'gir-1.0')) 28 builtins.__dict__['GIRDIR'] = [girdir] 29 30 # Again, relative paths first so that the installation prefix is relocatable 31-- 322.30.2 33 34