[tracker-miners/wip/carlosg/parallel-installable: 7/36] build: Make extract rules dir versioned
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/wip/carlosg/parallel-installable: 7/36] build: Make extract rules dir versioned
- Date: Mon, 6 Apr 2020 09:59:38 +0000 (UTC)
commit c78e2f292efe299f0fdf50d1a0d5259c581ee728
Author: Carlos Garnacho <carlosg gnome org>
Date: Sun Feb 23 16:45:12 2020 +0100
build: Make extract rules dir versioned
And make the modules dir agree on the directory name, i.e. no ".0"
suffix, as parallel installability between minor versions is not
observed.
meson.build | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index a59f74cb2..ee04c64bc 100644
--- a/meson.build
+++ b/meson.build
@@ -378,10 +378,8 @@ build_root = meson.current_build_dir()
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
-# the ontology is installed to the same location.
-tracker_extract_rules_dir = join_paths(get_option('prefix'), get_option('datadir'),
'tracker-miners/extract-rules')
+tracker_extract_modules_dir = join_paths(get_option('prefix'), get_option('libdir'), tracker_versioned_name,
'extract-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/miners')
tracker_writeback_modules_dir = join_paths(get_option('prefix'), get_option('libdir'),
'tracker-miners-@0@/writeback-modules'.format(tracker_api_version))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]