diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2021-02-25 10:04:58 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2021-03-10 09:41:59 +0000 |
| commit | a657dd0b45121735b2f80afa1e5e4940979d89ad (patch) | |
| tree | b8412c884c961f7c366dd027495aa33108fcece8 | |
| parent | 242578ac6ef807bf20125f0fdd14c5e4cb17e176 (diff) | |
meson.build: use built-in variable substitution handling instead of sed
Generated outputs are identical
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | include/X11/meson.build | 16 | ||||
| -rw-r--r-- | meson.build | 1 |
2 files changed, 7 insertions, 10 deletions
diff --git a/include/X11/meson.build b/include/X11/meson.build index a4b022e..556e090 100644 --- a/include/X11/meson.build +++ b/include/X11/meson.build @@ -18,15 +18,13 @@ elif cc.has_member('fd_set', '__fds_bits', prefix: fd_set_headers) else error('Your fd_set is too weird.') endif -custom_target('Xpoll.h', - capture : true, - install : true, - install_dir : get_option('includedir') + '/X11', - input : 'Xpoll.h.in', - output : 'Xpoll.h', - command : [ sed, - 's/@USE_FDS_BITS@/' + fds_bits + '/g', - '@INPUT@']) +xpoll_config = configuration_data() +xpoll_config.set('USE_FDS_BITS', fds_bits) +configure_file(input : 'Xpoll.h.in', + output : 'Xpoll.h', + install : true, + install_dir : get_option('includedir') + '/X11', + configuration: xpoll_config) install_headers( 'ap_keysym.h', diff --git a/meson.build b/meson.build index ce733a0..feb5ae9 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,6 @@ project('xorgproto', 'c', license : 'MIT', version : '2021.3') cc = meson.get_compiler('c') -sed = find_program('sed') pcs = [ 'applewmproto', |