aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2021-07-05 22:00:00 +0200
committerLibravatar Simon Ser <contact@emersion.fr>2021-09-15 08:21:20 +0200
commit9727db67cfb53ed641b1e622854a589333ba42bd (patch)
tree470a07efd1fdb92604b35d0fee1df7ca834f8331
parentreadme: Align Danish translation with main README (diff)
downloadsway-9727db67cfb53ed641b1e622854a589333ba42bd.tar.gz
sway-9727db67cfb53ed641b1e622854a589333ba42bd.tar.zst
sway-9727db67cfb53ed641b1e622854a589333ba42bd.zip
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(
3 'c', 3 'c',
4 version: '1.6', 4 version: '1.6',
5 license: 'MIT', 5 license: 'MIT',
6 meson_version: '>=0.58.1', 6 meson_version: '>=0.59.0',
7 default_options: [ 7 default_options: [
8 'c_std=c11', 8 'c_std=c11',
9 'warning_level=2', 9 'warning_level=2',
@@ -129,7 +129,6 @@ conf_data.set10('HAVE_TRAY', have_tray)
129scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages')) 129scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
130if scdoc.found() 130if scdoc.found()
131 scdoc_prog = find_program(scdoc.get_variable(pkgconfig: 'scdoc'), native: true) 131 scdoc_prog = find_program(scdoc.get_variable(pkgconfig: 'scdoc'), native: true)
132 sh = find_program('sh', native: true)
133 mandir = get_option('mandir') 132 mandir = get_option('mandir')
134 man_files = [ 133 man_files = [
135 'sway/sway.1.scd', 134 'sway/sway.1.scd',
@@ -158,10 +157,10 @@ if scdoc.found()
158 output, 157 output,
159 input: filename, 158 input: filename,
160 output: output, 159 output: output,
161 command: [ 160 command: scdoc_prog,
162 sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc_prog.full_path(), output)
163 ],
164 install: true, 161 install: true,
162 feed: true,
163 capture: true,
165 install_dir: '@0@/man@1@'.format(mandir, section) 164 install_dir: '@0@/man@1@'.format(mandir, section)
166 ) 165 )
167 endforeach 166 endforeach