[evince/wip/gpoo/drop-systemd-pkg-config] build: drop pkg-config check for systemduserunitdir
- From: Germán Poo-Caamaño <gpoo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince/wip/gpoo/drop-systemd-pkg-config] build: drop pkg-config check for systemduserunitdir
- Date: Wed, 10 Oct 2018 16:40:15 +0000 (UTC)
commit c63ec4c79ae66bb6fed909acc66fd1ae09c3148d
Author: Germán Poo-Caamaño <gpoo gnome org>
Date: Wed Oct 10 13:35:36 2018 -0300
build: drop pkg-config check for systemduserunitdir
In autotools, we explcitly avoid using pkg-config for detecting
systemduserunitdir becuse it usually defaults to /usr, which make
local installations a pain.
See #937 for a previous discussion about it.
Makes meson behave similar to autotools for systemduserunitdir.
Fixes #999
meson.build | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index b64415ef..dcf34b5b 100644
--- a/meson.build
+++ b/meson.build
@@ -233,10 +233,7 @@ systemd_user_unit_dir = get_option('systemduserunitdir')
install_systemd_user_unit_dir = (systemd_user_unit_dir != 'no')
if install_systemd_user_unit_dir and systemd_user_unit_dir == ''
- systemd_dep = dependency('systemd', required: false)
-
- assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd user unit dir
or disable it')
- systemd_user_unit_dir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
+ systemd_user_unit_dir = join_paths(ev_prefix, 'lib', 'systemd', 'user')
endif
# *** Check for Desktop Schemas ***
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]