diff options
author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2018-10-31 14:46:21 +0000 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2018-10-31 15:33:58 +0000 |
commit | 6eb608b9cc02166fb4e3770f1b34a6f1eba88dba (patch) | |
tree | da3c6deba812d3d9a9d7b87de81bcd04fb4057e9 | |
parent | 41f7ae6e49d6ea5919bfafbb11c894d61dcf1189 (diff) |
meson - ethumb - fix build and install of service files for ethumb
-rw-r--r-- | dbus-services/meson.build | 18 | ||||
-rw-r--r-- | meson.build | 3 | ||||
-rw-r--r-- | systemd-services/meson.build | 13 |
3 files changed, 34 insertions, 0 deletions
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 @@ | |||
1 | dep = dependency('dbus-1') | ||
2 | |||
3 | org_enlightenment_ethumb_service_config = configuration_data() | ||
4 | |||
5 | org_enlightenment_ethumb_service_config.set('prefix', dir_prefix) | ||
6 | |||
7 | systemd_dbus_prefix = '# ' | ||
8 | if get_option('systemd') == true | ||
9 | systemd_dbus_prefix = '' | ||
10 | endif | ||
11 | org_enlightenment_ethumb_service_config.set('systemd_dbus_prefix', | ||
12 | systemd_dbus_prefix) | ||
13 | |||
14 | configure_file( | ||
15 | input: 'org.enlightenment.Ethumb.service.in', | ||
16 | output: 'org.enlightenment.Ethumb.service', | ||
17 | configuration: org_enlightenment_ethumb_service_config, | ||
18 | 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( | |||
384 | configuration: config_h, | 384 | configuration: config_h, |
385 | install_dir : join_paths(dir_include,'elementary-'+version_major) | 385 | install_dir : join_paths(dir_include,'elementary-'+version_major) |
386 | ) | 386 | ) |
387 | |||
388 | subdir(join_paths('systemd-services')) | ||
389 | 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 @@ | |||
1 | if get_option('systemd') == true | ||
2 | dep = dependency('systemd') | ||
3 | |||
4 | ethumb_service_config = configuration_data() | ||
5 | |||
6 | ethumb_service_config.set('prefix', dir_prefix) | ||
7 | |||
8 | configure_file( | ||
9 | input: 'ethumb.service.in', | ||
10 | output: 'ethumb.service', | ||
11 | configuration: ethumb_service_config, | ||
12 | install_dir: dep.get_pkgconfig_variable('systemduserunitdir')) | ||
13 | endif | ||