From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Tue, 12 Feb 2019 17:40:29 +0000 (+0100)
Subject: meson: systemd - get unitdir, tmpfilesdir from pkg-config
X-Git-Tag: v4.0.0~24^2~131
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3efdebfbb79f8d2e9fd06b63c0c0117ab89f3d8a;p=thirdparty%2Fknot-resolver.git

meson: systemd - get unitdir, tmpfilesdir from pkg-config
---

diff --git a/meson.build b/meson.build
index 72a1aa9d0..0d402db14 100644
--- a/meson.build
+++ b/meson.build
@@ -95,6 +95,9 @@ if opt_systemd != 'disabled'
       systemd_socket = false
     endif
   endif
+  if systemd
+    pkgconf_systemd = dependency('systemd')
+  endif
   message('---------------------------')
 endif
 
diff --git a/systemd/meson.build b/systemd/meson.build
index a6571edc4..c252fd319 100644
--- a/systemd/meson.build
+++ b/systemd/meson.build
@@ -4,8 +4,8 @@
 systemd_work_dir = join_paths(
   prefix, get_option('localstatedir'), 'cache', 'knot-resolver')
 run_dir = join_paths('/run', 'knot-resolver')
-systemd_unit_dir = join_paths(lib_dir, 'systemd', 'system')
-systemd_tmpfiles_dir = join_paths(lib_dir, 'tmpfiles.d')
+systemd_unit_dir = pkgconf_systemd.get_pkgconfig_variable('systemdsystemunitdir')
+systemd_tmpfiles_dir = pkgconf_systemd.get_pkgconfig_variable('tmpfilesdir')
 
 ## configuration
 systemd_config = configuration_data()