build: don't use sh for scdoc v1 APPLIED

Simon Ser: 1
 build: don't use sh for scdoc

 1 files changed, 3 insertions(+), 4 deletions(-)

[PATCH] build: don't use sh for scdoc Export this patch

Just use the built-in feed/capture Meson options instead.
---

Needs a recent-ish Meson, so needs to be applied on top of the previous
patch.

 meson.build | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index b5d00c62448b..c3132943876b 100644
--- a/meson.build
+++ b/meson.build
@@ -247,7 +247,6 @@ else
 endif
 
 if scdoc.found()
-	scdoc_prog = find_program(scdoc.get_variable(pkgconfig: 'scdoc'), native: true)
 	mandir = get_option('mandir')
 
 	foreach src : ['seatd.1.scd', 'seatd-launch.1.scd']
@@ -259,9 +258,9 @@ if scdoc.found()
 			output,
 			input: 'man/' + src,
 			output: output,
-			command: [
-				'sh', '-c', '@0@ < @INPUT@ > @1@'.format(scdoc_prog.full_path(), output)
-			],
+			command: scdoc.get_variable(pkgconfig: 'scdoc'),
+			feed: true,
+			capture: true,
 			install: true,
 			install_dir: '@0@/man@1@'.format(mandir, section)
 		)

base-commit: 69cf5c36e05c64597063dd8c4d83d3e036547451
prerequisite-patch-id: 697af0e3889785e5261f2c5462251ca1787a4e1d
-- 
2.34.1

Kenny Levinsen <kl@kl.wtf>

7 months ago

Applied, thanks!