From 8f04a1ca2bf973e5419c32adca1dcf888e0b263f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 5 Apr 2022 16:52:44 +0200 Subject: meson: also allow setting GIT_VERSION via templates GIT_VERSION is not available as a config.h variable, because it's rendered into version.h during builds. Let's rework jinja2 rendering to also parse version.h. No functional change, the new variable is so far unused. I guess this will make partial rebuilds a bit slower, but it's useful to be able to use the full version string. --- src/timesync/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/timesync') diff --git a/src/timesync/meson.build b/src/timesync/meson.build index 8ecfbfab82..35467026a8 100644 --- a/src/timesync/meson.build +++ b/src/timesync/meson.build @@ -39,7 +39,7 @@ custom_target( 'timesyncd.conf', input : 'timesyncd.conf.in', output : 'timesyncd.conf', - command : [meson_render_jinja2, config_h, '@INPUT@', '@OUTPUT@'], + command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], install : conf.get('ENABLE_TIMESYNCD') == 1 and install_sysconfdir_samples, install_dir : pkgsysconfdir) -- cgit v1.2.1