From ff4c5270d303890a1523f5912b9fbab560e8e5e8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 10 Apr 2020 13:43:25 +0200 Subject: [PATCH] build: Obtain systemduserunitdir from pkg-config Previously, this prevented local installation because systemd did not make the variable's prefix overridable https://github.com/systemd/systemd/issues/9595 but since it has been fixed in systemd 242, we can finally use that. --- https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1194 --- meson.build | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index b5a4d1c00..95a6868f3 100644 --- a/meson.build +++ b/meson.build @@ -63,13 +63,6 @@ portaldir = join_paths(datadir, 'xdg-desktop-portal', 'portals') schemadir = join_paths(datadir, 'glib-2.0', 'schemas') servicedir = join_paths(datadir, 'dbus-1', 'services') -# XXX: Once https://github.com/systemd/systemd/issues/9595 is fixed and we can -# depend on this version, replace with something like: -# systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir', -# define_variable: ['prefix', prefix]) -# and uncomment systemd_dep below -systemduserunitdir = join_paths(prefix, 'lib', 'systemd', 'user') - keybindings_dep = dependency('gnome-keybindings', required: false) if keybindings_dep.found() keysdir = keybindings_dep.get_pkgconfig_variable('keysdir', define_variable: ['datadir', datadir]) @@ -122,8 +115,9 @@ endif if get_option('systemd') libsystemd_dep = dependency('libsystemd') - # XXX: see systemduserunitdir - # systemd_dep = dependency('systemd') + systemd_dep = dependency('systemd') + systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir', + define_variable: ['prefix', prefix]) have_systemd = true else libsystemd_dep = []