From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 17 May 2021 10:42:34 +0000 (+0200)
Subject: meson: add workaround for old meson
X-Git-Tag: v249-rc1~210^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17a2017f69489023733b2a631e2f122e19c8dbad;p=thirdparty%2Fsystemd.git

meson: add workaround for old meson

Recent meson versions include the directory name in the target name,
so there is no conflict for files with the same name in different
directories. But at least with meson-0.49.2 in buster we have conflict
with sysusers.d/systemd.conf.
---

diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
index d449034dba0..a8aaacaf29e 100644
--- a/tmpfiles.d/meson.build
+++ b/tmpfiles.d/meson.build
@@ -33,7 +33,8 @@ in_files = ['etc.conf',
 
 foreach file : in_files
         custom_target(
-                file,
+                # XXX: workaround for old meson. Drop when upgrading.
+                'tmpfiles+' + file,
                 input : file + '.in',
                 output: file,
                 command : [meson_render_jinja2, config_h, '@INPUT@'],