projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gitlab-ci: Set the prefix to ./install instead of the DESTDIR.
[mesa.git]
/
.gitlab-ci
/
meson-build.sh
diff --git
a/.gitlab-ci/meson-build.sh
b/.gitlab-ci/meson-build.sh
index d0df91fa3949988ba85c54629fa0de8335c46b93..42aed0e91c51974653a4a39f5f1c1b670c9e83bc 100755
(executable)
--- a/
.gitlab-ci/meson-build.sh
+++ b/
.gitlab-ci/meson-build.sh
@@
-17,6
+17,7
@@
fi
rm -rf _build
meson _build --native-file=native.file \
${CROSS+--cross /cross_file-$CROSS.txt} \
rm -rf _build
meson _build --native-file=native.file \
${CROSS+--cross /cross_file-$CROSS.txt} \
+ -D prefix=`pwd`/install \
-D libdir=lib \
-D buildtype=debug \
-D build-tests=true \
-D libdir=lib \
-D buildtype=debug \
-D build-tests=true \
@@
-32,7
+33,7
@@
cd _build
meson configure
ninja -j4
LC_ALL=C.UTF-8 ninja test
meson configure
ninja -j4
LC_ALL=C.UTF-8 ninja test
-
DESTDIR=$PWD/../install
ninja install
+ninja install
cd ..
if test -n "$MESON_SHADERDB"; then
cd ..
if test -n "$MESON_SHADERDB"; then