[tracker-miners/wip/carlosg/backports-for-3-1: 6/6] build: Avoid setting the regular library path in rpath

[Carlos Garnacho <carlosg src gnome org>]

commit c5e59bbb9384b369784e2d2449d1c52e4c842bd2
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Jun 8 11:19:22 2021 +0200

    build: Avoid setting the regular library path in rpath
    
    This is redundant, and Fedora has made it a requirement to drop
    unnecessary rpaths. Some executables don't require the internal
    libraries at all.

 meson.build                       | 1 -
 src/miners/fs/meson.build         | 2 +-
 src/miners/rss/meson.build        | 1 -
 src/tracker-control/meson.build   | 1 -
 src/tracker-extract/meson.build   | 2 +-
 src/tracker-writeback/meson.build | 2 +-
 src/tracker/meson.build           | 1 -
 7 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/meson.build b/meson.build
index 88749737b..08b0c783a 100644
--- a/meson.build
+++ b/meson.build
@@ -420,7 +420,6 @@ build_root = meson.current_build_dir()
 # directory, following the existing convention in that directory.
 tracker_api_versioned_name = 'tracker-miners-@0@'.format(tracker_api_version)
 tracker_internal_libs_dir = join_paths(get_option('prefix'), get_option('libdir'), 
tracker_api_versioned_name)
-tracker_install_rpath = ':'.join([tracker_internal_libs_dir, libdir])
 
 tracker_extract_modules_dir = join_paths(get_option('prefix'), get_option('libdir'), 
tracker_api_versioned_name, 'extract-modules')
 tracker_writeback_modules_dir = join_paths(get_option('prefix'), get_option('libdir'), 
tracker_api_versioned_name, 'writeback-modules')
diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
index e700dee6f..84326bef8 100644
--- a/src/miners/fs/meson.build
+++ b/src/miners/fs/meson.build
@@ -26,7 +26,7 @@ executable('tracker-miner-fs-@0@'.format(tracker_api_major),
     c_args: tracker_c_args,
     install: true,
     install_dir: get_option('libexecdir'),
-    install_rpath: tracker_install_rpath,
+    install_rpath: tracker_internal_libs_dir,
 )
 
 # This file allows starting the service with D-Bus autoactivation.
diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build
index 84eaa6bc0..10a78d005 100644
--- a/src/miners/rss/meson.build
+++ b/src/miners/rss/meson.build
@@ -9,7 +9,6 @@ executable('tracker-miner-rss-@0@'.format(tracker_api_major),
     c_args: tracker_c_args,
     install: true,
     install_dir: get_option('libexecdir'),
-    install_rpath: tracker_install_rpath,
 )
 
 # This file allows starting the service with D-Bus autoactivation.
diff --git a/src/tracker-control/meson.build b/src/tracker-control/meson.build
index 92703504b..bbf56d7e4 100644
--- a/src/tracker-control/meson.build
+++ b/src/tracker-control/meson.build
@@ -36,7 +36,6 @@ executable('tracker-miner-fs-control-@0@'.format(tracker_api_major),
     c_args: tracker_c_args,
     install: true,
     install_dir: get_option('libexecdir'),
-    install_rpath: tracker_install_rpath,
 )
 
 # This file allows starting the service with D-Bus autoactivation.
diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
index ebb6b168c..88ce49fb9 100644
--- a/src/tracker-extract/meson.build
+++ b/src/tracker-extract/meson.build
@@ -162,7 +162,7 @@ executable('tracker-extract-@0@'.format(tracker_api_major),
   dependencies: tracker_extract_dependencies,
   install: true,
   install_dir: join_paths(get_option('prefix'), get_option('libexecdir')),
-  install_rpath: tracker_install_rpath)
+  install_rpath: tracker_internal_libs_dir)
 
 # This file allows starting the service with D-Bus autoactivation.
 # It's also used by tracker-control to identify the miner.
diff --git a/src/tracker-writeback/meson.build b/src/tracker-writeback/meson.build
index 321e1491e..04ac38c8a 100644
--- a/src/tracker-writeback/meson.build
+++ b/src/tracker-writeback/meson.build
@@ -45,7 +45,7 @@ executable('tracker-writeback-@0@'.format(tracker_api_major),
   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_install_rpath)
+  install_rpath: tracker_internal_libs_dir)
 
 dbus_service_file = configure_file(
   input: 'org.freedesktop.Tracker3.Writeback.service.in',
diff --git a/src/tracker/meson.build b/src/tracker/meson.build
index 1433f8308..90c821a26 100644
--- a/src/tracker/meson.build
+++ b/src/tracker/meson.build
@@ -24,7 +24,6 @@ foreach m: modules
             '-DMANDIR="@0@"'.format(join_paths(get_option('prefix'), get_option('datadir'), 'man')),
         ],
         install: true,
-        install_rpath: tracker_install_rpath,
         install_dir: join_paths(get_option('libexecdir'), 'tracker@0@'.format(tracker_api_major)),
         dependencies: [tracker_sparql, tracker_miners_common_dep],
         include_directories: [commoninc, configinc, srcinc],