From 33016a5f93a910bafbd957320c9ae24967211060 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Sun, 12 Aug 2018 00:22:01 +0200 Subject: meson: Substitute @libexecdir@ in D-Bus service file correctly We were doing an unnecessary intltool-merge step for the file org.freedesktop.Tracker1.service while failing to do the necessary configuration substitution. Oops. --- src/tracker-store/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tracker-store/meson.build b/src/tracker-store/meson.build index 1c42da3a3..bf0d966a9 100644 --- a/src/tracker-store/meson.build +++ b/src/tracker-store/meson.build @@ -40,10 +40,10 @@ install_data( 'tracker-status.xml', install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'tracker')) -dbus_service_file = custom_target('tracker-store-dbus-service-file', +dbus_service_file = configure_file( input: 'org.freedesktop.Tracker1.service.in', output: 'org.freedesktop.Tracker1.service', - command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', po_subdir, '@INPUT@', '@OUTPUT@'], + configuration: conf, install: true, install_dir: dbus_services_dir) -- cgit v1.2.1