From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 16 May 2021 14:04:04 +0000 (+0200)
Subject: meson: use jinja2 in src/vconsole
X-Git-Tag: v249-rc1~210^2~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d587e04b9d2efe2bfc6df3e1946c46b106532ed;p=thirdparty%2Fsystemd.git

meson: use jinja2 in src/vconsole
---

diff --git a/src/vconsole/90-vconsole.rules.in b/src/vconsole/90-vconsole.rules.in
index a16988c38c3..845785492bb 100644
--- a/src/vconsole/90-vconsole.rules.in
+++ b/src/vconsole/90-vconsole.rules.in
@@ -9,4 +9,4 @@
 
 # Each vtcon keeps its own state of fonts.
 #
-ACTION=="add", SUBSYSTEM=="vtconsole", KERNEL=="vtcon*", RUN+="@rootlibexecdir@/systemd-vconsole-setup"
+ACTION=="add", SUBSYSTEM=="vtconsole", KERNEL=="vtcon*", RUN+="{{ROOTLIBEXECDIR}}/systemd-vconsole-setup"
diff --git a/src/vconsole/meson.build b/src/vconsole/meson.build
index 695ef0239dd..dea4121f1a7 100644
--- a/src/vconsole/meson.build
+++ b/src/vconsole/meson.build
@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-if conf.get('ENABLE_VCONSOLE') == 1
-        vconsole_rules = configure_file(
-                input : '90-vconsole.rules.in',
-                output : '90-vconsole.rules',
-                configuration : substs)
-        install_data(vconsole_rules,
-                     install_dir : udevrulesdir)
-endif
+custom_target(
+        '90-vconsole.rules',
+        input : '90-vconsole.rules.in',
+        output : '90-vconsole.rules',
+        command : [meson_render_jinja2, config_h, '@INPUT@'],
+        capture : true,
+        install : conf.get('ENABLE_VCONSOLE') == 1,
+        install_dir : udevrulesdir)