[tracker-miners/sam/versioned-name] build: Use `tracker3-miners` as versioned name, not `tracker-miners-3`

[Sam Thursfield <sthursfield src gnome org>]

commit 675186bd29b1370bfa10c8df4c8f62d9f78914f1
Author: Sam Thursfield <sam afuera me uk>
Date:   Wed Jun 17 21:37:02 2020 +0200

    build: Use `tracker3-miners` as versioned name, not `tracker-miners-3`
    
    This corresponds with the package name we expect distros to use.
    
    Fixes https://gitlab.gnome.org/GNOME/tracker/-/issues/228

 meson.build             | 11 +++++++----
 src/tracker/meson.build |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 57da50cc7..287e75ade 100644
--- a/meson.build
+++ b/meson.build
@@ -9,7 +9,7 @@ cc = meson.get_compiler('c')
 # This is the X.Y used in -llibtracker-FOO-X.Y
 tracker_api_version = '3.0'
 tracker_api_major = tracker_api_version.split('.')[0]
-tracker_versioned_name = 'tracker-miners-@0@'.format(tracker_api_major)
+tracker_versioned_name = 'tracker@0@-miners'.format(tracker_api_major)
 
 libdir = join_paths(get_option('prefix'), get_option('libdir'))
 datadir = join_paths(get_option('prefix'), get_option('datadir'))
@@ -391,13 +391,16 @@ srcinc = include_directories('src/')
 
 build_root = meson.current_build_dir()
 
-tracker_internal_libs_dir = join_paths(get_option('prefix'), get_option('libdir'), tracker_versioned_name)
+# We use tracker-miners-3.0 rather than tracker3-miners inside the lib64
+# 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_versioned_name, 
'extract-modules')
+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')
 tracker_extract_rules_dir = join_paths(get_option('prefix'), get_option('datadir'), tracker_versioned_name, 
'extract-rules')
 tracker_miner_services_dir = join_paths(get_option('prefix'), get_option('datadir'), tracker_versioned_name, 
'miners')
-tracker_writeback_modules_dir = join_paths(get_option('prefix'), get_option('libdir'), 
tracker_versioned_name, 'writeback-modules')
 
 tracker_uninstalled_extract_rules_dir = join_paths(meson.current_build_dir(), 'src', 'tracker-extract', 
'uninstalled-rules')
 tracker_uninstalled_writeback_modules_dir = join_paths(meson.current_build_dir(), 'src', 'tracker-writeback')
diff --git a/src/tracker/meson.build b/src/tracker/meson.build
index fbf1f6171..81ae2546d 100644
--- a/src/tracker/meson.build
+++ b/src/tracker/meson.build
@@ -24,7 +24,7 @@ foreach m: modules
         ],
         install: true,
         install_rpath: tracker_install_rpath,
-        install_dir: join_paths(get_option('libexecdir'), 'tracker-@0@'.format(tracker_api_major)),
+        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],
     )