From d6af585837b8a187a4a02ef8dc32528a8816c922 Mon Sep 17 00:00:00 2001 From: Johan Malm Date: Wed, 22 Sep 2021 20:21:00 +0100 Subject: [PATCH] build: remove scdoc stdin/stdout hack From version 0.59.0, meson supports feeding the input file as stdin. See sway@9727db67 --- docs/meson.build | 4 ++-- meson.build | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/meson.build b/docs/meson.build index e8584349..67fcc1f8 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,7 +1,6 @@ scdoc = find_program('scdoc', required: get_option('man-pages')) if scdoc.found() - sh = find_program('sh', native: true) sections = [ '.1', '-actions.5', @@ -16,8 +15,9 @@ if scdoc.found() custom_target( manpage, input: markdown, - command: [sh, '-c', 'scdoc < @INPUT@'], output: manpage, + command: scdoc, + feed: true, capture: true, install: true, install_dir: join_paths(get_option('mandir'), 'man' + s.split('.')[-1]) diff --git a/meson.build b/meson.build index b15ab832..9ca039e8 100644 --- a/meson.build +++ b/meson.build @@ -3,6 +3,7 @@ project( 'c', version: '0.3.0', license: 'GPL-2.0-only', + meson_version: '>=0.59.0', default_options: [ 'c_std=c11', 'warning_level=2', -- 2.52.0