From 6eb608b9cc02166fb4e3770f1b34a6f1eba88dba Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Wed, 31 Oct 2018 14:46:21 +0000 Subject: [PATCH] meson - ethumb - fix build and install of service files for ethumb --- dbus-services/meson.build | 18 ++++++++++++++++++ meson.build | 3 +++ systemd-services/meson.build | 13 +++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 dbus-services/meson.build create mode 100644 systemd-services/meson.build diff --git a/dbus-services/meson.build b/dbus-services/meson.build new file mode 100644 index 0000000000..29fe392411 --- /dev/null +++ b/dbus-services/meson.build @@ -0,0 +1,18 @@ +dep = dependency('dbus-1') + +org_enlightenment_ethumb_service_config = configuration_data() + +org_enlightenment_ethumb_service_config.set('prefix', dir_prefix) + +systemd_dbus_prefix = '# ' +if get_option('systemd') == true + systemd_dbus_prefix = '' +endif +org_enlightenment_ethumb_service_config.set('systemd_dbus_prefix', + systemd_dbus_prefix) + +configure_file( + input: 'org.enlightenment.Ethumb.service.in', + output: 'org.enlightenment.Ethumb.service', + configuration: org_enlightenment_ethumb_service_config, + install_dir: dep.get_pkgconfig_variable('session_bus_services_dir')) diff --git a/meson.build b/meson.build index 0d2224f7d0..d06f148a8e 100644 --- a/meson.build +++ b/meson.build @@ -384,3 +384,6 @@ configure_file( configuration: config_h, install_dir : join_paths(dir_include,'elementary-'+version_major) ) + +subdir(join_paths('systemd-services')) +subdir(join_paths('dbus-services')) diff --git a/systemd-services/meson.build b/systemd-services/meson.build new file mode 100644 index 0000000000..18be63c5ef --- /dev/null +++ b/systemd-services/meson.build @@ -0,0 +1,13 @@ +if get_option('systemd') == true + dep = dependency('systemd') + + ethumb_service_config = configuration_data() + + ethumb_service_config.set('prefix', dir_prefix) + + configure_file( + input: 'ethumb.service.in', + output: 'ethumb.service', + configuration: ethumb_service_config, + install_dir: dep.get_pkgconfig_variable('systemduserunitdir')) +endif