summaryrefslogtreecommitdiffstats
path: root/catalog
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2023-08-23 12:23:50 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2023-08-24 11:17:50 +0200
commitc31ba5cfe9edc9b354967dc8e69be09b9c735481 (patch)
treec9b940b48608d0149cd8e19dc8fd19f735b239d4 /catalog
parentrepart: Make verity example more useful (diff)
downloadsystemd-c31ba5cfe9edc9b354967dc8e69be09b9c735481.tar.xz
systemd-c31ba5cfe9edc9b354967dc8e69be09b9c735481.zip
meson: use 'sh' variable everywhere
We went back-and-forth a bit on this. Very old meson would print a message about detecting the program if a quoted argument was used, leading to a lot of noise. So we started to convert various places to use the variable, but then it turned out that meson < 0.56.2 doesn't handle this correctly and we reverted to using strings everywhere in 7c22f07cbd86b39e78990057687e5509fa299672. Then at some point we stopped supporting old meson and over time we started using the variable in various places again, somewhat inconsistently. Then most calls to 'sh' were removed in 9289e093ae6fd5484f9119e1ee07d1dffe37cd10 when install_emptydir() builtin started being used. Now meson allows either the string or variable to be used, and doesn't print a message if the string is used. Let's use the variable everywhere. For 'sh', we could do either, but for other variables, we _do_ want the detection to happen, for example for git, find, awk, which might not be installed and we want to detect that early, before we start the build. It would be ugly to use quotes for some programs, but not for others. Also, a string is still refused for test(), so we couldn't use the string version even if we didn't care about detection.
Diffstat (limited to 'catalog')
-rw-r--r--catalog/meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/catalog/meson.build b/catalog/meson.build
index 146daba124..3c62749cf9 100644
--- a/catalog/meson.build
+++ b/catalog/meson.build
@@ -34,5 +34,5 @@ foreach file : in_files
install_dir : catalogdir)
endforeach
-meson.add_install_script('sh', '-c',
+meson.add_install_script(sh, '-c',
'test -n "$DESTDIR" || @0@/journalctl --update-catalog'.format(bindir))