From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Mon, 12 Oct 2020 12:10:20 +0000 (+0200)
Subject: meson: fix sysusers/tmpfiles installation
X-Git-Tag: v5.2.0~16^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff0e660612511f1fc2770204f53d0fa180c78862;p=thirdparty%2Fknot-resolver.git

meson: fix sysusers/tmpfiles installation

Target name must be unique in meson, but the installed files share
the same name. To get around this, use a temporary target name and
rename it when installing the file to its proper location.
---

diff --git a/systemd/meson.build b/systemd/meson.build
index dbc31a94b..6ca0bac13 100644
--- a/systemd/meson.build
+++ b/systemd/meson.build
@@ -42,16 +42,25 @@ if systemd_files == 'enabled'
   ## tmpfiles
   tmpfiles = configure_file(
     input: 'tmpfiles.d/knot-resolver.conf.in',
-    output: 'knot-resolver.conf',
+    output: 'knot-resolver.tmpfiles',
     configuration: systemd_config,
+  )
+  install_data(
+    tmpfiles,
+    rename: ['knot-resolver.conf'],
     install_dir: systemd_tmpfiles_dir,
   )
 
   ## sysusers
   sysusers = configure_file(
     input: 'sysusers.d/knot-resolver.conf.in',
-    output: 'knot-resolver.conf',
+    output: 'knot-resolver.sysusers',
     configuration: systemd_config,
+  )
+  install_data(
+    sysusers,
+    rename: ['knot-resolver.conf'],
     install_dir: systemd_sysusers_dir,
   )
+
 endif