summaryrefslogtreecommitdiffstats
path: root/catalog
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-05-14 16:12:51 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-05-14 19:52:25 +0200
commit7c22f07cbd86b39e78990057687e5509fa299672 (patch)
treea60365cb0c086712e52d8bdb846025e7fe5e8f74 /catalog
parentmeson: print autodetected sbat fields (diff)
downloadsystemd-7c22f07cbd86b39e78990057687e5509fa299672.tar.xz
systemd-7c22f07cbd86b39e78990057687e5509fa299672.zip
meson: revert the change to unquote commands in add_install_script
Old meson fails with: Element not a string: [<Holder: <ExternalProgram 'sh' -> ['/bin/sh']>>, '-c', 'test -n "$DESTDIR" || /bin/journalctl --update-catalog'] I'm doing it as a revert so that it's easy to undo the revert when we require newer meson. The effect is not so bad, maybe a dozen or so lines about finding 'sh'.
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 d34e413d4f..7139c2e053 100644
--- a/catalog/meson.build
+++ b/catalog/meson.build
@@ -29,5 +29,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(rootbindir))