[tracker-miners/wip/carlosg/parallel-installable: 32/59] build: Move domain ontology directory to $datadir/tracker-miners-3

[Carlos Garnacho <carlosg src gnome org>]

commit 4d89bf37a42b5224acf61e27b53db18ed4d2e92a
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Feb 23 17:13:32 2020 +0100

    build: Move domain ontology directory to $datadir/tracker-miners-3
    
    This required updating the TrackerDomainOntologies helper in
    libtracker-miners-common.

 data/meson.build                                       | 2 +-
 meson.build                                            | 2 ++
 src/libtracker-miners-common/meson.build               | 5 ++++-
 src/libtracker-miners-common/tracker-domain-ontology.c | 6 +++---
 4 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 6ef95f837..5a382b313 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -44,6 +44,6 @@ custom_target('tracker-miners-compile-schemas',
 tracker_miners_uninstalled_gsettings_schema_dir = meson.current_build_dir()
 
 install_data('default.rule',
-    install_dir: join_paths(get_option('datadir'), 'tracker', 'domain-ontologies'))
+    install_dir: join_paths(get_option('datadir'), tracker_versioned_name, 'domain-ontologies'))
 
 tracker_miners_uninstalled_domain_rule = meson.current_source_dir() / 'default.rule'
diff --git a/meson.build b/meson.build
index 221414eae..b1bac4528 100644
--- a/meson.build
+++ b/meson.build
@@ -35,6 +35,7 @@ if get_option('tracker_core') == 'system'
   tracker_uninstalled_stop_words_dir = join_paths(tracker_sparql.get_pkgconfig_variable('datadir'), 
'tracker', 'stop-words')
   tracker_uninstalled_testutils_dir = tracker_testutils.get_pkgconfig_variable('python_path')
   tracker_uninstalled_nepomuk_ontologies_dir = 
join_paths(tracker_sparql.get_pkgconfig_variable('ontologies_dir'), 'nepomuk')
+  tracker_ontologies_dir = tracker_sparql.get_pkgconfig_variable('ontologies_dir')
 
   tracker_sparql_uninstalled_dir = tracker_sparql.get_pkgconfig_variable('libdir')
 else
@@ -48,6 +49,7 @@ else
   tracker_uninstalled_stop_words_dir = tracker_subproject.get_variable('tracker_uninstalled_stop_words_dir')
   tracker_uninstalled_testutils_dir = tracker_subproject.get_variable('tracker_uninstalled_testutils_dir')
   tracker_uninstalled_nepomuk_ontologies_dir = 
tracker_subproject.get_variable('tracker_uninstalled_nepomuk_ontologies_dir')
+  tracker_ontologies_dir = tracker_subproject.get_variable('tracker_ontologies_dir')
 
   tracker_common_enums_header = tracker_subproject.get_variable('tracker_common_enums_header')
 endif
diff --git a/src/libtracker-miners-common/meson.build b/src/libtracker-miners-common/meson.build
index 162fc3ea9..1c29eef1b 100644
--- a/src/libtracker-miners-common/meson.build
+++ b/src/libtracker-miners-common/meson.build
@@ -38,7 +38,10 @@ endif
 libtracker_miners_common = static_library('tracker-miners-common',
   tracker_miners_common_sources,
   dependencies: tracker_miners_common_dependencies + tracker_miners_common_private_dependencies,
-  c_args: tracker_c_args,
+  c_args: tracker_c_args + [
+      '-DTRACKERSHAREDIR="@0@"'.format(tracker_versioned_name),
+      '-DONTOLOGIESDIR="@0@"'.format(tracker_ontologies_dir),
+  ],
   include_directories: [configinc, srcinc],
 )
 
diff --git a/src/libtracker-miners-common/tracker-domain-ontology.c 
b/src/libtracker-miners-common/tracker-domain-ontology.c
index 3ad1deb01..3fbc628c5 100644
--- a/src/libtracker-miners-common/tracker-domain-ontology.c
+++ b/src/libtracker-miners-common/tracker-domain-ontology.c
@@ -201,7 +201,7 @@ find_rule_in_data_dirs (const gchar *name)
 
        for (i = 0; data_dirs[i] != NULL; i++) {
                path = g_build_filename (data_dirs[i],
-                                        "tracker", "domain-ontologies",
+                                        TRACKERSHAREDIR, "domain-ontologies",
                                         rule_name, NULL);
                if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
                        g_free (rule_name);
@@ -251,7 +251,7 @@ tracker_domain_ontology_new (const gchar   *domain_name,
                        goto end;
                }
        } else {
-               path = g_build_filename (SHAREDIR, "tracker", "domain-ontologies",
+               path = g_build_filename (SHAREDIR, TRACKERSHAREDIR, "domain-ontologies",
                                         DEFAULT_RULE, NULL);
 
                if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
@@ -316,7 +316,7 @@ tracker_domain_ontology_new (const gchar   *domain_name,
        if (!domain_ontology->ontology_location) {
                gchar *ontology_path;
 
-               ontology_path = g_build_filename (SHAREDIR, "tracker", "ontologies",
+               ontology_path = g_build_filename (ONTOLOGIESDIR,
                                                  domain_ontology->ontology_name, NULL);
 
                if (!g_file_test (ontology_path, G_FILE_TEST_IS_DIR)) {