diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-04-05 16:52:44 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-04-05 22:18:31 +0200 |
commit | 8f04a1ca2bf973e5419c32adca1dcf888e0b263f (patch) | |
tree | 978baef3c11ea9c87119843b155a47618e5377ca /shell-completion | |
parent | 3761002eeaead8392a1c1517251c4f9be7c688aa (diff) | |
download | systemd-8f04a1ca2bf973e5419c32adca1dcf888e0b263f.tar.gz |
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.
Diffstat (limited to 'shell-completion')
-rw-r--r-- | shell-completion/bash/meson.build | 2 | ||||
-rw-r--r-- | shell-completion/zsh/meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build index ae6a61e555..fb7314348a 100644 --- a/shell-completion/bash/meson.build +++ b/shell-completion/bash/meson.build @@ -14,7 +14,7 @@ custom_target( 'systemctl', input : 'systemctl.in', output : 'systemctl', - command : [meson_render_jinja2, config_h, '@INPUT@', '@OUTPUT@'], + command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], install : bashcompletiondir != 'no', install_dir : bashcompletiondir) diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build index bac531798c..b39f933ea4 100644 --- a/shell-completion/zsh/meson.build +++ b/shell-completion/zsh/meson.build @@ -9,7 +9,7 @@ custom_target( '_systemctl', input : '_systemctl.in', output : '_systemctl', - command : [meson_render_jinja2, config_h, '@INPUT@', '@OUTPUT@'], + command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], install : zshcompletiondir != 'no', install_dir : zshcompletiondir) |