[tracker-miners/wip/carlosg/parallel-installable: 11/27] tracker-writeback: Install versioned executable



commit 498f8a711a056f743b4f2b03e5e00c23635a8faa
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Feb 23 19:56:19 2020 +0100

    tracker-writeback: Install versioned executable
    
    This is now installed as tracker-writeback-3, and referenced as such
    everywhere.

 src/tracker-writeback/meson.build                                   | 4 ++--
 src/tracker-writeback/org.freedesktop.Tracker3.Writeback.service.in | 2 +-
 src/tracker-writeback/tracker-writeback.service.in                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/tracker-writeback/meson.build b/src/tracker-writeback/meson.build
index 3270c22fc..d58262919 100644
--- a/src/tracker-writeback/meson.build
+++ b/src/tracker-writeback/meson.build
@@ -39,7 +39,7 @@ tracker_writeback_sources = [
   'tracker-main.c'
 ]
 
-executable('tracker-writeback',
+executable('tracker-writeback-@0@'.format(tracker_api_major),
   tracker_writeback_sources,
   c_args: tracker_c_args + [
     '-DWRITEBACK_MODULES_DIR="@0@"'.format(tracker_writeback_modules_dir),
@@ -59,7 +59,7 @@ dbus_service_file = configure_file(
 if get_option('systemd_user_services')
   configure_file(
     input: 'tracker-writeback.service.in',
-    output: 'tracker-writeback.service',
+    output: 'tracker-writeback-@0@.service'.format(tracker_api_major),
     configuration: conf,
     install: true,
     install_dir: systemd_user_services_dir)
diff --git a/src/tracker-writeback/org.freedesktop.Tracker3.Writeback.service.in 
b/src/tracker-writeback/org.freedesktop.Tracker3.Writeback.service.in
index 45838280c..02ae18b89 100644
--- a/src/tracker-writeback/org.freedesktop.Tracker3.Writeback.service.in
+++ b/src/tracker-writeback/org.freedesktop.Tracker3.Writeback.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=org.freedesktop.Tracker3.Writeback
-Exec=@libexecdir@/tracker-writeback
+Exec=@libexecdir@/tracker-writeback-3
 SystemdService=tracker-writeback.service
diff --git a/src/tracker-writeback/tracker-writeback.service.in 
b/src/tracker-writeback/tracker-writeback.service.in
index cf238d2b0..cebe3dd5f 100644
--- a/src/tracker-writeback/tracker-writeback.service.in
+++ b/src/tracker-writeback/tracker-writeback.service.in
@@ -4,7 +4,7 @@ Description=Tracker data writeback service
 [Service]
 Type=dbus
 BusName=org.freedesktop.Tracker3.Writeback
-ExecStart=@libexecdir@/tracker-writeback
+ExecStart=@libexecdir@/tracker-writeback-3
 Restart=on-failure
 # Don't restart after tracker daemon -k (aka tracker-control -k)
 RestartPreventExitStatus=SIGKILL


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]