xserver: Branch 'master'

[GitLab Mirror]

 test/scripts/build-travis-deps.sh |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit c1bb392b1df4023e9dec489facfa221a53499ddc
Author: Michel Daenzer <michel at daenzer.net>
Date:   Wed Dec 12 12:55:57 2018 +0100

    travis: Use a single meson invocation
    
    The prefix setting didn't take for some reason.

diff --git a/test/scripts/build-travis-deps.sh b/test/scripts/build-travis-deps.sh
index f52587dd5..6fd20b231 100755
--- a/test/scripts/build-travis-deps.sh
+++ b/test/scripts/build-travis-deps.sh
@@ -15,8 +15,7 @@ cp test/tetexec.cfg $XTEST_DIR/xts5
 
 set -x
 
-meson setup build/
-meson configure -Dprefix=$PREFIX build/
+meson -Dprefix=$PREFIX build/
 ninja -C build/ install
 ninja -C build/ test