From 576f0a72c5213c30f6d8348b58317d13f5f69bfd Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Thu, 25 Nov 2021 16:57:02 +0300
Subject: [PATCH] scripts: install with destdir option on CI

---
 scripts/cirrus/build_freebsd.sh | 2 +-
 scripts/gha/build_linux.sh      | 6 +++---
 scripts/gha/build_motomagx.sh   | 2 +-
 scripts/gha/build_win32.sh      | 4 ++--
 scripts/travis/build_linux.sh   | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/cirrus/build_freebsd.sh b/scripts/cirrus/build_freebsd.sh
index 6fdcec8e..bc8f5f01 100755
--- a/scripts/cirrus/build_freebsd.sh
+++ b/scripts/cirrus/build_freebsd.sh
@@ -12,7 +12,7 @@ build_engine()
 	cd "$CIRRUS_WORKING_DIR" || die
 
 	if [ "$APP" = "xashds" ]; then
-		./waf configure -T release -d -W || die
+		./waf configure -T release -d || die
 	elif [ "$APP" = "xash3d-fwgs" ]; then
 		./waf configure -T release --enable-stb -W --enable-utils || die
 	else
diff --git a/scripts/gha/build_linux.sh b/scripts/gha/build_linux.sh
index 6c5f1d64..77910f98 100755
--- a/scripts/gha/build_linux.sh
+++ b/scripts/gha/build_linux.sh
@@ -46,9 +46,9 @@ build_engine()
 	fi
 
 	if [ "$1" = "dedicated" ]; then
-		./waf configure -T release -d -W $AMD64 || die
+		./waf configure -T release -d $AMD64 || die
 	elif [ "$1" = "full" ]; then
-		./waf configure --sdl2=SDL2_linux -T release --enable-stb --prefix="$APPDIR" -W $AMD64 --enable-utils || die
+		./waf configure --sdl2=SDL2_linux -T release --enable-stb $AMD64 --enable-utils || die
 	else
 		die
 	fi
@@ -60,7 +60,7 @@ build_appimage()
 {
 	cd "$BUILDDIR" || die
 
-	./waf install || die
+	./waf install --destdir="$APPDIR" || die
 
 	# Generate extras.pak
 	python3 scripts/makepak.py xash-extras/ "$APPDIR/extras.pak"
diff --git a/scripts/gha/build_motomagx.sh b/scripts/gha/build_motomagx.sh
index 4fa7e22f..06c06e7d 100755
--- a/scripts/gha/build_motomagx.sh
+++ b/scripts/gha/build_motomagx.sh
@@ -12,7 +12,7 @@ cd hlsdk
 ./waf configure -T fast --enable-magx --enable-simple-mod-hacks build install --destdir=../Xash || die
 cd ../
 
-./waf configure -T fast --enable-magx --win-style-install --prefix='' build install --destdir=Xash/ || die
+./waf configure -T fast --enable-magx build install --destdir=Xash/ || die
 
 cat > Xash/run.sh << 'EOF'
 mypath=${0%/*}
diff --git a/scripts/gha/build_win32.sh b/scripts/gha/build_win32.sh
index bb91e8ff..051a65a9 100755
--- a/scripts/gha/build_win32.sh
+++ b/scripts/gha/build_win32.sh
@@ -11,9 +11,9 @@ fi
 
 # NOTE: to build with other version use --msvc_version during configuration
 # NOTE: sometimes you may need to add WinSDK to %PATH%
-./waf.bat configure -s "SDL2_VC" -T "debug" --prefix=`pwd` --enable-utils $AMD64 || die
+./waf.bat configure -s "SDL2_VC" -T "debug" --enable-utils $AMD64 || die
 ./waf.bat build -v || die
-./waf.bat install || die
+./waf.bat install --prefix=`pwd` || die
 
 if [ "$ARCH" = "i386" ]; then
 	cp SDL2_VC/lib/x86/SDL2.dll . # Install SDL2
diff --git a/scripts/travis/build_linux.sh b/scripts/travis/build_linux.sh
index 70a83ab2..3da6ed33 100755
--- a/scripts/travis/build_linux.sh
+++ b/scripts/travis/build_linux.sh
@@ -46,9 +46,9 @@ build_engine()
 	fi
 
 	if [ "$1" = "dedicated" ]; then
-		./waf configure -T release -d -W $AMD64 || die
+		./waf configure -T release -d $AMD64 || die
 	elif [ "$1" = "full" ]; then
-		./waf configure --sdl2=SDL2_linux -T release --enable-stb --prefix="$APPDIR" -W $AMD64 --enable-utils || die
+		./waf configure --sdl2=SDL2_linux -T release --enable-stb $AMD64 --enable-utils || die
 	else
 		die
 	fi
@@ -60,7 +60,7 @@ build_archive()
 {
 	cd "$BUILDDIR" || die
 
-	./waf install || die
+	./waf install --prefix="$APPDIR" || die
 
 	# Generate extras.pak
 	python3 scripts/makepak.py xash-extras/ "$APPDIR/extras.pak"