diff options
| author | Sam Thursfield <sam@afuera.me.uk> | 2020-04-29 18:36:06 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam@afuera.me.uk> | 2020-04-29 18:36:06 +0000 |
| commit | 913cedbb3b6d8e6008b676f4b12e4ae54650ef0a (patch) | |
| tree | a4c014f42cbc0a2b88dd3cae0d84f4ca3e1a17af | |
| parent | 2ac988e56ecc8235a59bc52fdb5ed9bb79a00e8f (diff) | |
| parent | d3b32126f93b12aa858da146ae2b2e0ee0e91a90 (diff) | |
| download | tracker-913cedbb3b6d8e6008b676f4b12e4ae54650ef0a.tar.gz | |
Merge branch 'abderrahim/systemdunitdir' into 'tracker-2.3'
build: get the systemd user unit dir from pkg-config
See merge request GNOME/tracker!206
| -rw-r--r-- | meson.build | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 26adf3017..b580a1ea9 100644 --- a/meson.build +++ b/meson.build @@ -198,12 +198,11 @@ endif install_systemd_user_services = false if get_option('systemd_user_services') == 'yes' or get_option('systemd_user_services') == 'auto' - systemd = dependency('systemd', required: false) + systemd = dependency('systemd', version: '>= 242', required: false) if systemd.found() - # FIXME: this would ideally use the systemduserunitdir pkgconfig variable, but - # it does not depend on variables we can override to install within prefix. install_systemd_user_services = true - systemd_user_services_dir = join_paths(libdir, 'systemd', 'user') + systemd_user_services_dir = systemd.get_pkgconfig_variable('systemduserunitdir', + define_variable: ['prefix', get_option('prefix')]) else install_systemd_user_services = false systemd_user_services_dir = '(not found)' |