[tracker/wip/carlosg/parallel-installable: 4/12] build: Install ontologies/stop-words in $datadir/tracker-3

[Carlos Garnacho <carlosg src gnome org>]

commit 843a1cba7add34f5d4ec925228ae0670028b4710
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Feb 23 13:42:39 2020 +0100

    build: Install ontologies/stop-words in $datadir/tracker-3
    
    So they can be installed in parallel with other major versions

 meson.build                                  | 2 +-
 src/libtracker-common/stop-words/meson.build | 2 +-
 src/libtracker-direct/tracker-direct.c       | 2 +-
 src/libtracker-sparql-backend/meson.build    | 2 +-
 src/tracker/tracker-endpoint.c               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 66fc9342a..7165e06fe 100644
--- a/meson.build
+++ b/meson.build
@@ -255,7 +255,7 @@ tracker_install_rpath = ':'.join([tracker_internal_libs_dir, libdir])
 
 # NOTE: We don't use ${TRACKER_API_VERSION} because other content like
 # the ontology is installed to the same location.
-tracker_ontologies_dir = join_paths(get_option('prefix'), get_option('datadir'), 'tracker/ontologies')
+tracker_ontologies_dir = join_paths(get_option('prefix'), get_option('datadir'), tracker_versioned_name, 
'ontologies')
 
 vapi_dir = join_paths(get_option('prefix'), get_option('datadir'), 'vala', 'vapi')
 
diff --git a/src/libtracker-common/stop-words/meson.build b/src/libtracker-common/stop-words/meson.build
index 54f638b6f..f5c618c28 100644
--- a/src/libtracker-common/stop-words/meson.build
+++ b/src/libtracker-common/stop-words/meson.build
@@ -15,7 +15,7 @@ stopwords_files = [
 ]
 
 stopwords_install_dir = join_paths(
-  get_option('datadir'), 'tracker', 'stop-words')
+  get_option('datadir'), tracker_versioned_name, 'stop-words')
 
 install_data(stopwords_files,
   install_dir: stopwords_install_dir)
diff --git a/src/libtracker-direct/tracker-direct.c b/src/libtracker-direct/tracker-direct.c
index c625cee10..be5d44f82 100644
--- a/src/libtracker-direct/tracker-direct.c
+++ b/src/libtracker-direct/tracker-direct.c
@@ -268,7 +268,7 @@ tracker_direct_connection_initable_init (GInitable     *initable,
                /* If the connection is read/write, and no ontology is specified,
                 * we use the Nepomuk one.
                 */
-               filename = g_build_filename (SHAREDIR, "tracker", "ontologies",
+               filename = g_build_filename (SHAREDIR, "tracker-3", "ontologies",
                                             "nepomuk", NULL);
                priv->ontology = g_file_new_for_path (filename);
                g_free (filename);
diff --git a/src/libtracker-sparql-backend/meson.build b/src/libtracker-sparql-backend/meson.build
index 314afcc2a..e3736e532 100644
--- a/src/libtracker-sparql-backend/meson.build
+++ b/src/libtracker-sparql-backend/meson.build
@@ -38,7 +38,7 @@ pkg.generate(libtracker_sparql,
         'exec_prefix=${prefix}',
         'libexecdir=${prefix}' / get_option('libexecdir'),
         'datadir=${prefix}' / get_option('datadir'),
-        'tracker_datadir=${datadir}' / 'tracker',
+        'tracker_datadir=${datadir}' / tracker_versioned_name,
         'ontologies_dir=' + tracker_ontologies_dir,
     ],
 )
diff --git a/src/tracker/tracker-endpoint.c b/src/tracker/tracker-endpoint.c
index 16f7ba4d8..c36df7b24 100644
--- a/src/tracker/tracker-endpoint.c
+++ b/src/tracker/tracker-endpoint.c
@@ -226,7 +226,7 @@ tracker_endpoint (int argc, const char **argv)
        if (ontology_path) {
                ontology = g_file_new_for_commandline_arg (ontology_path);
        } else if (ontology_name) {
-               gchar *path = g_build_filename (SHAREDIR, "tracker", "ontologies", ontology_name, NULL);
+               gchar *path = g_build_filename (SHAREDIR, "tracker-3", "ontologies", ontology_name, NULL);
                ontology = g_file_new_for_path (path);
                g_free (path);
        }