Right now we're setting the prefix to a custom path, which
results in paths like
/builds/libvirt/libvirt/vroot/etc/libvirt/virtqemud.conf
ending up in the generated HTML. In order to avoid that,
set the prefix and other installation paths to reasonable
default values by passing
-Dsystem=true
and then take advantage of $DESTDIR support to still be able
to write the HTML files without requiring root privileges.
Reported-by: Martin Kletzander <mkletzan(a)redhat.com>
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a8b89729f..d5c431dee0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,9 +67,9 @@ website:
before_script:
- *script_variables
script:
- - meson setup build --werror --prefix=$(pwd)/vroot || (cat
build/meson-logs/meson-log.txt && exit 1)
- - ninja -C build install-web
- - mv vroot/share/doc/libvirt/html/ website
+ - meson setup build --werror -Dsystem=true || (cat build/meson-logs/meson-log.txt
&& exit 1)
+ - DESTDIR=$(pwd)/install ninja -C build install-web
+ - mv install/usr/share/doc/libvirt/html/ website
artifacts:
expose_as: 'Website'
name: 'website'
--
2.35.3