Skip to content

Commit

Permalink
meson: fix installation of prebuilt manpages in dist tarball
Browse files Browse the repository at this point in the history
'page' contains the name of the program we are building/installing a
manual for. In the custom targets for building the manpages, we append
.xml and .8 in turn -- we don't replace a ".xml" in the page name.

As there is nothing to replace, we end up checking if e.g. "./arping"
exists, and trying to install it as a manual if so -- rather than
arping.8 as intended. Sync the logic so that this works.

Fixes: 535f6de ("meson: include pre-generated man pages & HTML docs in dist tarballs")
Closes: iputils#556
Reviewed-by: Petr Vorel <[email protected]>
Signed-off-by: Eli Schwartz <[email protected]>
  • Loading branch information
eli-schwartz authored and pevik committed Oct 18, 2024
1 parent b912d64 commit dca2358
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions doc/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ if meson.version().version_compare('>=0.58.0')
out_html_pages = []
generated_docs_exist = true
foreach page : manpages
man_page_name = page.replace('.xml', '.8')
html_page_name = page.replace('.xml', '.html')
man_page_name = page + '.8'
html_page_name = page + '.html'
out_man_pages += man_page_name
out_html_pages += html_page_name
if not fs.exists(man_page_name) or not fs.exists(html_page_name)
Expand Down

0 comments on commit dca2358

Please sign in to comment.