From c980139b7ec1522dd05b6a9d842d5e8f5b3b348a Mon Sep 17 00:00:00 2001 From: Nikita Zlobin Date: Sat, 22 Jul 2023 03:32:52 +0500 Subject: [PATCH] update man pages without scripts Signed-off-by: Dave Davenport --- Makefile.am | 1 - doc/meson.build | 32 ++++++++++++++++++++------------ doc/meson_build_manpages.sh | 12 ------------ 3 files changed, 20 insertions(+), 25 deletions(-) delete mode 100755 doc/meson_build_manpages.sh diff --git a/Makefile.am b/Makefile.am index a9b37c82..acf567ef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -668,7 +668,6 @@ EXTRA_DIST += \ subprojects/libgwater/nl/libgwater-nl.c \ subprojects/libgwater/alsa-mixer/libgwater-alsa-mixer.h \ subprojects/libgwater/alsa-mixer/libgwater-alsa-mixer.c \ - doc/meson_build_manpages.sh \ data/rofi.png\ meson_options.txt \ meson.build diff --git a/doc/meson.build b/doc/meson.build index b123254e..8a2f8c5c 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -1,17 +1,25 @@ gomd2man = find_program('go-md2man', required: false) if gomd2man.found() - run_target('update-manpage', - command: [ 'meson_build_manpages.sh', files( - 'rofi.1.markdown', - 'rofi-theme-selector.1.markdown', - 'rofi-theme.5.markdown', - 'rofi-dmenu.5.markdown', - 'rofi-debugging.5.markdown', - 'rofi-keys.5.markdown', - 'rofi-script.5.markdown', - 'rofi-sensible-terminal.1.markdown' - )] - ) + man_targets = [] + foreach f: [ + 'rofi.1', + 'rofi-theme-selector.1', + 'rofi-theme.5', + 'rofi-dmenu.5', + 'rofi-debugging.5', + 'rofi-keys.5', + 'rofi-script.5', + 'rofi-sensible-terminal.1' + ] + man_targets += custom_target(f, + input: '.'.join([f, 'markdown']), + output: f, + command: [ 'go-md2man', + '-in', files('.'.join([f,'markdown'])), + '-out', files(f) + ]) + endforeach + run_target('update-manpage', command: ['true'], depends: man_targets) endif doxy_conf = configuration_data() diff --git a/doc/meson_build_manpages.sh b/doc/meson_build_manpages.sh deleted file mode 100755 index eaea2cc1..00000000 --- a/doc/meson_build_manpages.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -## Did not get this working in meson directly. -## not via generator or custom_target. - - -pushd "${MESON_BUILD_ROOT}" - -for a in $@ -do - go-md2man -in "$a" -out ${a%.markdown} -done