aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2021-07-05 22:00:00 +0200
committerSimon Ser <contact@emersion.fr>2021-09-15 08:21:20 +0200
commit9727db67cfb53ed641b1e622854a589333ba42bd (patch)
tree470a07efd1fdb92604b35d0fee1df7ca834f8331
parent94e041b5f6c1fc2a53a357304fd937be7f2c5ccc (diff)
build: remove scdoc stdin/stdout hack
Since [1], Meson allows feeding the input file as stdin and capturing stout to the output file. We don't need the sh hack anymore. [1]: https://github.com/mesonbuild/meson/pull/8923
-rw-r--r--meson.build9
1 files changed, 4 insertions, 5 deletions
diff --git a/meson.build b/meson.build
index 756857b7..436b84d1 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project(
'c',
version: '1.6',
license: 'MIT',
- meson_version: '>=0.58.1',
+ meson_version: '>=0.59.0',
default_options: [
'c_std=c11',
'warning_level=2',
@@ -129,7 +129,6 @@ conf_data.set10('HAVE_TRAY', have_tray)
scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
if scdoc.found()
scdoc_prog = find_program(scdoc.get_variable(pkgconfig: 'scdoc'), native: true)
- sh = find_program('sh', native: true)
mandir = get_option('mandir')
man_files = [
'sway/sway.1.scd',
@@ -158,10 +157,10 @@ if scdoc.found()
output,
input: filename,
output: output,
- command: [
- sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc_prog.full_path(), output)
- ],
+ command: scdoc_prog,
install: true,
+ feed: true,
+ capture: true,
install_dir: '@0@/man@1@'.format(mandir, section)
)
endforeach