[tracker/wip/jtojnar/typelibdir] build: Clean up typelib path

[Jan Tojnar <jtojnar src gnome org>]

commit 5e74cd256b24e8297445665c225d39a1f366f00d
Author: Jan Tojnar <jtojnar gmail com>
Date:   Thu May 14 18:06:56 2020 +0200

    build: Clean up typelib path
    
    It is better to set up the paths in the top level, rather than cobbling them up at place of use.
    
    Joining paths using string concatenation also breaks alternative Meson implementations that support 
absolute libdir option.

 meson.build                               | 3 +++
 utils/trackertestutils/meson.build        | 2 +-
 utils/trackertestutils/tracker-sandbox.in | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index e4ae7d675..8150c944f 100644
--- a/meson.build
+++ b/meson.build
@@ -258,6 +258,9 @@ tracker_ontologies_dir = join_paths(get_option('prefix'), get_option('datadir'),
 
 vapi_dir = join_paths(get_option('prefix'), get_option('datadir'), 'vala', 'vapi')
 
+typelib_dir = gobject_introspection.get_pkgconfig_variable('typelibdir',
+                                                           define_variable:  [ 'libdir', libdir ])
+
 subdir('src')
 subdir('docs')
 subdir('examples')
diff --git a/utils/trackertestutils/meson.build b/utils/trackertestutils/meson.build
index 3ccfa6b18..93c0b500e 100644
--- a/utils/trackertestutils/meson.build
+++ b/utils/trackertestutils/meson.build
@@ -20,7 +20,7 @@ if get_option('test_utils')
   install_data(sources, install_dir: testutils_dir / 'trackertestutils')
 
   script_conf = configuration_data()
-  script_conf.set('libdir', get_option('libdir'))
+  script_conf.set('typelibdir', typelib_dir)
   script_conf.set('prefix', get_option('prefix'))
   script_conf.set('testutils_dir', testutils_dir)
   configure_file(
diff --git a/utils/trackertestutils/tracker-sandbox.in b/utils/trackertestutils/tracker-sandbox.in
index e67855f12..cd960ace4 100755
--- a/utils/trackertestutils/tracker-sandbox.in
+++ b/utils/trackertestutils/tracker-sandbox.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export GI_TYPELIB_PATH=@prefix@/@libdir@/girepository-1.0/:$GI_TYPELIB_PATH
+export GI_TYPELIB_PATH=@typelibdir@/:$GI_TYPELIB_PATH
 export PYTHONPATH=@testutils_dir@
 
 python3 -m trackertestutils --prefix=@prefix@ $@