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/obconf-qt/APKBUILD | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'user/obconf-qt/APKBUILD')

diff --git a/user/obconf-qt/APKBUILD b/user/obconf-qt/APKBUILD
index 2569121a0..08ad8f475 100644
--- a/user/obconf-qt/APKBUILD
+++ b/user/obconf-qt/APKBUILD
@@ -6,6 +6,7 @@ pkgrel=0
 pkgdesc="Qt5-based Openbox configuration tool"
 url="https://lxqt.org/"
 arch="all"
+options="!check"  # No test suite.
 license="GPL-2.0+"
 depends=""
 makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 openbox-dev
@@ -13,11 +14,9 @@ makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 openbox-dev
 source="https://github.com/lxqt/obconf-qt/releases/download/$pkgver/obconf-qt-$pkgver.tar.xz"
 
 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 \
@@ -25,18 +24,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="7ae4feb8daa3853f768e9cb613fc99046f98744e03efc673ee9e5cb3d4ffa2861f2a9f762acd9c54ef2b9ca3f288d2901cdcce5c09db84689dd186006b8e26ed  obconf-qt-0.14.1.tar.xz"
-- 
cgit v1.2.3-60-g2f50