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