diff --git a/data/meson.build b/data/meson.build index deb4021..b6d50a3 100644 --- a/data/meson.build +++ b/data/meson.build @@ -16,19 +16,18 @@ if desktop_utils.found() test('Validate desktop file', desktop_utils, args: [desktop_file]) endif -servicedir = get_option('prefix') / get_option('datadir') / 'dbus-1' / 'services' service_conf = configuration_data() -service_conf.set('bindir', servicedir) +service_conf.set('prefix', get_option('prefix')) +service_conf.set('bindir', get_option('bindir')) configure_file( input: 'org.freedesktop.FileManager1.service.in', output: 'org.freedesktop.FileManager1.service', configuration: service_conf, - install_dir: servicedir + install_dir: join_paths(get_option('datadir'), 'dbus-1', 'services') ) - appstream_file = i18n.merge_file( input: configure_file( input: 'hu.kramo.Hyperplane.metainfo.xml.in', diff --git a/data/org.freedesktop.FileManager1.service.in b/data/org.freedesktop.FileManager1.service.in index 9ba296c..d03ed73 100644 --- a/data/org.freedesktop.FileManager1.service.in +++ b/data/org.freedesktop.FileManager1.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.freedesktop.FileManager1 -Exec=@bindir@/hyperplane --gapplication-service +Exec=@prefix@/@bindir@/hyperplane --gapplication-service