External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

docs: fix docs output path with meson 0.60.0

Browse Source 
The meson 0.60.0 release introduced a bug with the '/' operator when
using an empty path component. '/foo' / ''  will now result in '/foo'
not '/foo/'

  https://github.com/mesonbuild/meson/issues/9450

This breaks libvirt because xsltproc requires the trailing '/' on the
output directory path. Fortunately the explicit 'join_paths' function
is not affected by the regression

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-10-25 18:48:59 +01:00
parent 8e3a7c6db9
commit 460eda9b05
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/meson.build
View File

@ -1,7 +1,9 @@
docs_html_dir = docdir / 'html' docs_html_dir = docdir / 'html'
# xsltproc requires that the -o path ends with '/' # xsltproc requires that the -o path ends with '/'
docs_builddir = meson.current_build_dir() / '' # Not using '/' operator due to bug in meson 0.60.0
# https://github.com/mesonbuild/meson/issues/9450
docs_builddir = join_paths(meson.current_build_dir(), '')
docs_assets = [ docs_assets = [
'android-chrome-192x192.png', 'android-chrome-192x192.png',