From 17a2017f69489023733b2a631e2f122e19c8dbad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 17 May 2021 12:42:34 +0200 Subject: [PATCH] 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. --- tmpfiles.d/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build index d449034dba..a8aaacaf29 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@'],