alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

build: remove scdoc stdin/stdout hack

Browse source 
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
This commit is contained in:
Simon Ser 2021-07-05 22:00:00 +02:00
parent 94e041b5f6
commit 9727db67cf
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
meson.build
View file

@ -3,7 +3,7 @@ project(
'c', 'c',
version: '1.6', version: '1.6',
license: 'MIT', license: 'MIT',
meson_version: '>=0.58.1', meson_version: '>=0.59.0',
default_options: [ default_options: [
'c_std=c11', 'c_std=c11',
'warning_level=2', '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')) scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
if scdoc.found() if scdoc.found()
scdoc_prog = find_program(scdoc.get_variable(pkgconfig: 'scdoc'), native: true) scdoc_prog = find_program(scdoc.get_variable(pkgconfig: 'scdoc'), native: true)
sh = find_program('sh', native: true)
mandir = get_option('mandir') mandir = get_option('mandir')
man_files = [ man_files = [
'sway/sway.1.scd', 'sway/sway.1.scd',
@ -158,10 +157,10 @@ if scdoc.found()
output, output,
input: filename, input: filename,
output: output, output: output,
command: [ command: scdoc_prog,
sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc_prog.full_path(), output)
],
install: true, install: true,
feed: true,
capture: true,
install_dir: '@0@/man@1@'.format(mandir, section) install_dir: '@0@/man@1@'.format(mandir, section)
) )
endforeach endforeach