From f7d2e810ba32b1cfa766a82920684f4580d91fda Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Fri, 28 Feb 2025 15:52:33 +0200 Subject: [PATCH] ci: Adjust prefix instead of setting DESTDIR for meson-dist job This ensures that the pkg-config files installed to xserver-tarball/install will have correct paths. This is needed so that xf86-driver-build-test will be able to reuse this installation of xserver. It will be passed to that job via artifacts (subsequent commits) Part-of: --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be9109896..8bd8ebb63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -242,7 +242,7 @@ meson-dist: - .gitlab-ci/meson-build.sh -C xserver-tarball --skip-test --skip-dist --run-install variables: MESON_DIST_ARGS: --no-tests - DESTDIR: xserver-tarball/install/ + MESON_EXTRA_ARGS: -Dprefix=$CI_PROJECT_DIR/xserver-tarball/install/ xf86-driver-build-test: extends: