12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849 |
- From 322294d7bf61f9fdf0e45e9b6c6013a7c6a35bfd Mon Sep 17 00:00:00 2001
- From: Derrick Lyndon Pallas <derrick@meter.com>
- Date: Wed, 14 Oct 2020 18:25:54 +0000
- Subject: [PATCH] Do not fail to build if ronn is missing
- If ruby-ronn is missing, we can not compile the man page from markdown but
- that should not prevent the application from building.
- Signed-off-by: Derrick Lyndon Pallas <derrick@meter.com>
- ---
- meson.build | 23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
- diff --git a/meson.build b/meson.build
- index a2169fc..981d4a4 100644
- --- a/meson.build
- +++ b/meson.build
- @@ -72,16 +72,17 @@ ipcalc = executable('ipcalc',
- install : true
- )
-
- -ronn = find_program('ronn', required: true)
- -
- -ipcalc_1 = custom_target(
- - 'ipcalc.1',
- - output : 'ipcalc.1',
- - input : 'ipcalc.1.md',
- - command : [ronn, '--pipe', '-r', '@INPUT@'],
- - capture: true,
- - install_dir: join_paths(get_option('mandir'), 'man1'),
- - install: true
- -)
- +ronn = find_program('ronn', required: false)
- +if ronn.found()
- + ipcalc_1 = custom_target(
- + 'ipcalc.1',
- + output : 'ipcalc.1',
- + input : 'ipcalc.1.md',
- + command : [ronn, '--pipe', '-r', '@INPUT@'],
- + capture: true,
- + install_dir: join_paths(get_option('mandir'), 'man1'),
- + install: true
- + )
- +endif
-
- subdir('tests')
- --
- 2.28.0
|