From 460eda9b055d6ba646004dd39a5d664a8ab47587 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 25 Oct 2021 18:48:59 +0100 Subject: [PATCH] docs: fix docs output path with meson 0.60.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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é --- docs/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/meson.build b/docs/meson.build index cbc138fa1f..fb6e0029d0 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,7 +1,9 @@ docs_html_dir = docdir / 'html' # 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 = [ 'android-chrome-192x192.png', -- 2.47.3