The doxygen man pages are incorrectly being installed alongside the HTML
documentation. Install them in the right location, in the $mandir
directory, by specifying a separate install location for each doxygen
target.
As a drive-by cleanup, replace the join_path() function with the meson's
'/' path concatenation operator.
Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
---
doc/meson.build | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/doc/meson.build b/doc/meson.build
index fef3e83fa432..02a30dc5688a 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -15,15 +15,16 @@ doxyfile = configure_file(input : 'Doxyfile.in',
output : 'Doxyfile',
configuration : cdata)
-doxygen_install_dir = join_paths(get_option('datadir'), 'doc',
- '@0@'.format(meson.project_name()))
+doxygen_install_dirs = []
doxygen_output = []
if get_option('doxygen-html')
doxygen_output += 'html'
+ doxygen_install_dirs += get_option('datadir') / 'doc' / '@0@'.format(meson.project_name())
endif
if get_option('doxygen-man')
doxygen_output += 'man'
+ doxygen_install_dirs += get_option('mandir') / '..'
endif
custom_target('doxygen',
@@ -31,4 +32,4 @@ custom_target('doxygen',
output : doxygen_output,
command : [prog_doxygen, doxyfile],
install : true,
- install_dir : doxygen_install_dir)
+ install_dir : doxygen_install_dirs)
base-commit: cdb3d1a7309d2daed5626c8c4ddbe9e5498e938b
--
Regards,
Laurent Pinchart
