From 0c5b26444fd47efa86c29f8a0661ab601f6a8ddd Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Mon, 6 Jan 2020 00:11:58 +0000
Subject: user/*: Modernise / fix syntax / deps / mark no-check where
 applicable

---
 user/qps/APKBUILD | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'user/qps/APKBUILD')

diff --git a/user/qps/APKBUILD b/user/qps/APKBUILD
index f1764e9b5..c260bdfe0 100644
--- a/user/qps/APKBUILD
+++ b/user/qps/APKBUILD
@@ -13,14 +13,13 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev
 	qt5-qttools-dev libxrender-dev lxqt-build-tools>=0.6.0"
 subpackages="$pkgname-doc"
 source="https://github.com/lxqt/qps/releases/download/$pkgver/qps-$pkgver.tar.xz
-	qps-1.10.17-compile-fixes.patch"
+	qps-1.10.17-compile-fixes.patch
+	"
 
 build() {
-	cd "$builddir"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
-	mkdir -p build && cd build
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
@@ -28,18 +27,16 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS} ..
-	make
+		${CMAKE_CROSSOPTS} -Bbuild
+	make -C build
 }
 
 check() {
-	cd "$builddir"/build
-	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+	CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
 }
 
 package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
 sha512sums="407130ac12f1e68da3e22543634d101c7a8353363ff1d9c6edbf98ce5d48f149aa5d937985f00109b40bd3cdb0b9a8e9745e845dd921be4aaf119022632bb9ef  qps-1.10.20.tar.xz
-- 
cgit v1.2.3-70-g09d2