[tracker-miners/tracker-miners-2.2: 24/47] build: Include libdir in rpath

[Sam Thursfield <sthursfield src gnome org>]

commit 78b0c54416539e98e0cdc47d9eee3919519c5023
Author: Sam Thursfield <sam afuera me uk>
Date:   Wed Jul 10 11:23:44 2019 +0100

    build: Include libdir in rpath
    
    This fixes the case where Tracker is installed into a non-standard
    prefix such as /opt/tracker and then fails to start with an error
    such as this:
    
            /opt/tracker/bin/tracker: error while loading shared libraries: libtracker-control-2.0.so.0: 
cannot open shared object file: No such file or directory

 meson.build                       | 1 +
 src/miners/fs/meson.build         | 2 +-
 src/miners/rss/meson.build        | 2 +-
 src/tracker-extract/meson.build   | 2 +-
 src/tracker-writeback/meson.build | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index 8fba6662c..8746b3611 100644
--- a/meson.build
+++ b/meson.build
@@ -386,6 +386,7 @@ configinc = include_directories('./')
 srcinc = include_directories('src/')
 
 tracker_internal_libs_dir = join_paths(get_option('prefix'), get_option('libdir'), 'tracker-miners-' + 
tracker_api_version)
+tracker_install_rpath = ':'.join([tracker_internal_libs_dir, libdir])
 
 tracker_extract_modules_dir = join_paths(get_option('prefix'), get_option('libdir'), 
'tracker-miners-@0@/extract-modules'.format(tracker_api_version))
 # NOTE: We don't use ${TRACKER_API_VERSION} because other content like
diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
index f96daa95d..b58bfbd71 100644
--- a/src/miners/fs/meson.build
+++ b/src/miners/fs/meson.build
@@ -31,7 +31,7 @@ executable('tracker-miner-fs', sources,
     c_args: tracker_c_args,
     install: true,
     install_dir: get_option('libexecdir'),
-    install_rpath: tracker_internal_libs_dir,
+    install_rpath: tracker_install_rpath,
 )
 
 dbus_service_file_untranslated = configure_file(
diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build
index 38949eca1..239394049 100644
--- a/src/miners/rss/meson.build
+++ b/src/miners/rss/meson.build
@@ -8,7 +8,7 @@ executable('tracker-miner-rss', sources,
     c_args: tracker_c_args,
     install: true,
     install_dir: get_option('libexecdir'),
-    install_rpath: tracker_internal_libs_dir,
+    install_rpath: tracker_install_rpath,
 )
 
 dbus_service_file_untranslated = configure_file(
diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
index b4bb2f93a..b8ab6baaa 100644
--- a/src/tracker-extract/meson.build
+++ b/src/tracker-extract/meson.build
@@ -167,7 +167,7 @@ executable('tracker-extract',
   dependencies: tracker_extract_dependencies,
   install: true,
   install_dir: join_paths(get_option('prefix'), get_option('libexecdir')),
-  install_rpath: tracker_internal_libs_dir)
+  install_rpath: tracker_install_rpath)
 
 dbus_service_file_untranslated = configure_file(
   input: 'org.freedesktop.Tracker1.Miner.Extract.service.in.in',
diff --git a/src/tracker-writeback/meson.build b/src/tracker-writeback/meson.build
index ad3d86e0d..5d4b81b86 100644
--- a/src/tracker-writeback/meson.build
+++ b/src/tracker-writeback/meson.build
@@ -47,7 +47,7 @@ executable('tracker-writeback',
   dependencies: [gmodule, tracker_miner, tracker_sparql, tracker_miners_common_dep],
   install: true,
   install_dir: join_paths(get_option('prefix'), get_option('libexecdir')),
-  install_rpath: tracker_internal_libs_dir)
+  install_rpath: tracker_install_rpath)
 
 dbus_service_file = configure_file(
   input: 'org.freedesktop.Tracker1.Writeback.service.in',