user/*: Modernise / fix syntax / deps / mark no-check where applicable

42 files changed, 134 insertions, 272 deletions

diff --git a/user/font-sony-misc/APKBUILD b/user/font-sony-misc/APKBUILD
index 7ce54a805..d0d93d617 100644
--- a/user/font-sony-misc/APKBUILD
+++ b/user/font-sony-misc/APKBUILD
@@ -12,13 +12,11 @@ subpackages=""
 source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
-	update_config_sub
 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,12 +25,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 	find "$pkgdir" -name fonts.dir -exec rm {} +
 }
diff --git a/user/libart-lgpl/APKBUILD b/user/libart-lgpl/APKBUILD
index 8eb73fdb3..ac519161e 100644
--- a/user/libart-lgpl/APKBUILD
+++ b/user/libart-lgpl/APKBUILD
@@ -11,17 +11,14 @@ depends=""
 makedepends=""
 subpackages="$pkgname-dev"
 source="https://download.gnome.org/sources/libart_lgpl/2.3/libart_lgpl-$pkgver.tar.bz2"
-
 builddir="$srcdir"/libart_lgpl-$pkgver
 
 prepare() {
-	cd "$builddir"
-	update_config_sub
 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -30,7 +27,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libfm-extra/APKBUILD b/user/libfm-extra/APKBUILD
index 775b4d322..5a8cb58fb 100644
--- a/user/libfm-extra/APKBUILD
+++ b/user/libfm-extra/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Library for generating menu caches"
 url="https://wiki.lxde.org/en/PCManFM"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="glib-dev intltool"
 subpackages="$pkgname-dev"
 source="https://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz"
@@ -14,7 +15,6 @@ source="https://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz"
 builddir="$srcdir/libfm-$pkgver"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -24,12 +24,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libfm-qt/APKBUILD b/user/libfm-qt/APKBUILD
index 61264a8fe..62110c28a 100644
--- a/user/libfm-qt/APKBUILD
+++ b/user/libfm-qt/APKBUILD
@@ -6,6 +6,7 @@ pkgrel=0
 pkgdesc="Qt library for file management and bindings for libfm"
 url="https://lxqt.org"
 arch="all"
+options="!check"  # No test suite.
 license="LGPL-2.1+"
 depends=""
 depends_dev="libfm-dev menu-cache-dev libexif-dev"
@@ -15,11 +16,9 @@ subpackages="$pkgname-dev"
 source="https://github.com/lxqt/libfm-qt/releases/download/$pkgver/libfm-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 \
@@ -28,18 +27,16 @@ build() {
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS -O0" \
 		-DCMAKE_C_FLAGS="$CFLAGS -O0" \
 		-DPULL_TRANSLATIONS=False \
-		${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="a265f6831a077ccb78a994828e6c69a22f2f6432b1f6ed6f404af41f013112870f7aee98067f2c466bec6cdfea040c10c7ce7e0f0ed977e5d266ec38e543d2a7  libfm-qt-0.14.1.tar.xz"
diff --git a/user/libfm/APKBUILD b/user/libfm/APKBUILD
index ad75ec5d9..bddbf32f2 100644
--- a/user/libfm/APKBUILD
+++ b/user/libfm/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Library for file management"
 url="https://wiki.lxde.org/en/PCManFM"
 arch="all"
 license="GPL-2.0+"
+depends=""
 makedepends="dbus-glib-dev glib-dev gtk+2.0-dev intltool libexif-dev
 	libfm-extra-dev menu-cache-dev udisks2-dev"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
@@ -15,7 +16,6 @@ source="https://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.xz
 	"
 
 build() {
-	cd "$builddir"
 	mv data/libfm.conf data/libfm.conf.sample
 	./configure \
 		--prefix=/usr \
@@ -26,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/liblxqt/APKBUILD b/user/liblxqt/APKBUILD
index 925d03c0b..020e173ee 100644
--- a/user/liblxqt/APKBUILD
+++ b/user/liblxqt/APKBUILD
@@ -16,25 +16,22 @@ subpackages="$pkgname-dev"
 source="https://github.com/lxqt/liblxqt/releases/download/$pkgver/liblxqt-$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 \
 		-DBUILD_SHARED_LIBS=True \
-		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS} ..
-	make
+		${CMAKE_CROSSOPTS} -Bbuild
+	make -C build
 }
 
 package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
 sha512sums="28ce5e924d136f9907f84e40d4823c412df071009a9d5da4e061ce969d7575b21210d5178103f9bfc73baa87ccafc87dcb6e29a737467ca1a459c1fd3c1071ba  liblxqt-0.14.1.tar.xz"
diff --git a/user/libqtxdg/APKBUILD b/user/libqtxdg/APKBUILD
index 8f9f29fa1..60f967c06 100644
--- a/user/libqtxdg/APKBUILD
+++ b/user/libqtxdg/APKBUILD
@@ -14,11 +14,9 @@ subpackages="$pkgname-dev"
 source="https://github.com/lxqt/libqtxdg/releases/download/$pkgver/libqtxdg-$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 \
@@ -28,18 +26,16 @@ build() {
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DBUILD_TESTS=True \
 		-DBUILD_DEV_UTILS=True \
-		${CMAKE_CROSSOPTS} ..
-	make
+		${CMAKE_CROSSOPTS} -Bbuild
+	make -C build
 }
 
 check() {
-	cd "$builddir"/build
-	make test
+	make -C build test
 }
 
 package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
 sha512sums="9bd52ae3aa32f8c7de48e562ada1ff2413892c7ac58d5f7a06c0c512a4a6c03e9c5c44930f7781930c9c701894ea38a450a61a3c26afc047c76313ada0a890e6  libqtxdg-3.4.0.tar.xz"
diff --git a/user/libstatgrab/APKBUILD b/user/libstatgrab/APKBUILD
index 09deb09b9..45a2bc72d 100644
--- a/user/libstatgrab/APKBUILD
+++ b/user/libstatgrab/APKBUILD
@@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="https://ftp.i-scream.org/pub/i-scream/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	LIBS="-lutmps -lskarnet -ltinfo" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -28,12 +27,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/libsysstat/APKBUILD b/user/libsysstat/APKBUILD
index c7bccafc6..92acda745 100644
--- a/user/libsysstat/APKBUILD
+++ b/user/libsysstat/APKBUILD
@@ -14,11 +14,9 @@ subpackages="$pkgname-dev"
 source="https://github.com/lxqt/libsysstat/releases/download/$pkgver/libsysstat-$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 \
@@ -26,13 +24,12 @@ build() {
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS} ..
-	make
+		${CMAKE_CROSSOPTS} -Bbuild
+	make -C build
 }
 
 package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
 sha512sums="9059b9d20edbb7ecd89e722b48c6603b8042030ffad06d3eac167bb518691c2733d314649dc4c42a839d4812c7b65dcd043a13a6bd5b56678da112a8065717df  libsysstat-0.4.2.tar.xz"
diff --git a/user/lm_sensors/APKBUILD b/user/lm_sensors/APKBUILD
index bf7ed865c..19286ae5f 100644
--- a/user/lm_sensors/APKBUILD
+++ b/user/lm_sensors/APKBUILD
@@ -22,7 +22,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/lm-sensors/lm-sensors/archiv
 builddir="$srcdir/$_pkgname-$_pkgver"
 
 prepare() {
-	cd "$builddir"
+	default_prepare
+
 	sed -i -e 's:^# \(PROG_EXTRA\):\1:' Makefile
 	# Respect LDFLAGS
 	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile
@@ -31,39 +32,32 @@ prepare() {
 
 	# do not check for libiconv in ldconfig cache
 	sed -i -e 's/^LIBICONV.*/LIBICONV ?=/' prog/sensors/Module.mk
-
-	default_prepare
 }
 
 build() {
-	cd "$builddir"
 	export CFLAGS="$CFLAGS -fno-stack-protector"
 	make PREFIX=/usr user
 }
 
 package() {
-	cd "$builddir"
 	make PROG_EXTRA:=sensord user_install \
 		PREFIX=/usr \
 		MANDIR=/usr/share/man \
 		DESTDIR="$pkgdir"
 
-	cd "$srcdir"
-	install -Dm755 fancontrol.initd "$pkgdir"/etc/init.d/fancontrol
+	install -Dm755 "$srcdir"/fancontrol.initd "$pkgdir"/etc/init.d/fancontrol
 }
 
 detect() {
 	depends="perl"
 	pkgdesc="Detection/migration scripts for lm_sensors"
 	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/sbin
-	cd "$pkgdir"
-	mv usr/bin/sensors-conf-convert "$subpkgdir"/usr/bin/
-	mv usr/sbin/sensors-detect "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/bin/sensors-conf-convert "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/sbin/sensors-detect "$subpkgdir"/usr/bin/
 }
 
 sensord() {
 	pkgdesc="sensord daemon"
-	cd "$builddir"
 	mkdir -p "$subpkgdir"/usr/sbin
 	mv "$pkgdir"/usr/sbin/sensord "$subpkgdir"/usr/sbin/sensord
 }
diff --git a/user/lximage-qt/APKBUILD b/user/lximage-qt/APKBUILD
index 41aaee8c1..b5a76d86d 100644
--- a/user/lximage-qt/APKBUILD
+++ b/user/lximage-qt/APKBUILD
@@ -15,11 +15,9 @@ makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 libexif-dev
 source="https://github.com/lxqt/lximage-qt/releases/download/$pkgver/lximage-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 \
@@ -27,18 +25,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="61286ade177a41d954e7b624b9f1320dc64fe6ef5ccc5ffbde5edee1e8cb00f3691b6a04f8eac4314b3fb622ba0613eb4d1851358f3a8c12e4a69d990c1ce3cd  lximage-qt-0.14.1.tar.xz"
diff --git a/user/lxmenu-data/APKBUILD b/user/lxmenu-data/APKBUILD
index ddb05161b..a8d4d4b92 100644
--- a/user/lxmenu-data/APKBUILD
+++ b/user/lxmenu-data/APKBUILD
@@ -8,17 +8,16 @@ url="https://lxqt.org"
 arch="noarch"
 options="!check"  # No test suite.
 license="LGPL-2.1+"
+depends=""
 makedepends="automake autoconf glib-dev intltool"
 source="lxmenu-data-$pkgver.tar.gz::https://github.com/lxde/lxmenu-data/archive/$pkgver.tar.gz"
 
 prepare() {
 	default_prepare
-	cd "$builddir"
 	./autogen.sh
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,7 +28,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/lxqt-about/APKBUILD b/user/lxqt-about/APKBUILD
index 3cc69d071..767194b42 100644
--- a/user/lxqt-about/APKBUILD
+++ b/user/lxqt-about/APKBUILD
@@ -14,11 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qttools-dev kwindowsystem-dev
 source="https://github.com/lxqt/lxqt-about/releases/download/$pkgver/lxqt-about-$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 \
@@ -26,13 +24,12 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS} ..
-	make
+		${CMAKE_CROSSOPTS} -Bbuild
+	make -C build
 }
 
 package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
 sha512sums="09cbb4c6c331b16b551d1b63ad4643f424fbaa35cfa9e2d4c70393fae499d403bf8a70c8105d258bd84200d06862033bfe0a082500e794b0db10df38d27b407a  lxqt-about-0.14.1.tar.xz"
diff --git a/user/lxqt-admin/APKBUILD b/user/lxqt-admin/APKBUILD
index 36ce2fe7c..a464f20d0 100644
--- a/user/lxqt-admin/APKBUILD
+++ b/user/lxqt-admin/APKBUILD
@@ -14,11 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qttools-dev kwindowsystem-dev
 source="https://github.com/lxqt/lxqt-admin/releases/download/$pkgver/lxqt-admin-$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 \
@@ -26,13 +24,12 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS} ..
-	make
+		${CMAKE_CROSSOPTS} -Bbuild
+	make -C build
 }
 
 package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
 sha512sums="bd6272a3042a71e9e00b2ba10be2575649c2d2750a4e00a6e11adaae6b91ccab5e3cf79a8ceb7bfbe808ec80c139b93e02cd96990f80b68a77a974c063e6a373  lxqt-admin-0.14.1.tar.xz"
diff --git a/user/lxqt-build-tools/APKBUILD b/user/lxqt-build-tools/APKBUILD
index 66a6285a0..05e730aae 100644
--- a/user/lxqt-build-tools/APKBUILD
+++ b/user/lxqt-build-tools/APKBUILD
@@ -18,21 +18,19 @@ build() {
 	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 \
 		-DBUILD_SHARED_LIBS=True \
-		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS} ..
-	make
+		${CMAKE_CROSSOPTS} -Bbuild
+	make -C build
 }
 
 package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
 sha512sums="701b2f239daeb72dd94e2d72920e85e161daeb35de24023d81bb271c3abf36916d83b4b47b046e400e865e71ee236cbfc0a7047f9b0a3529cd9b8363279fb88a  lxqt-build-tools-0.6.0.tar.gz"
diff --git a/user/lxqt-config/APKBUILD b/user/lxqt-config/APKBUILD
index 7f29e3e72..5f64da9ce 100644
--- a/user/lxqt-config/APKBUILD
+++ b/user/lxqt-config/APKBUILD
@@ -16,29 +16,25 @@ subpackages="$pkgname-doc"
 source="https://github.com/lxqt/lxqt-config/releases/download/$pkgver/lxqt-config-$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 \
 		-DBUILD_SHARED_LIBS=True \
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		${CMAKE_CROSSOPTS} ..
-	make -j1
+		${CMAKE_CROSSOPTS} -Bbuild
+	make -j1 -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="747644f8e0623cb2e8eadda57c7307387423152a089d5b423b06650fbf235371764a26e82363cbee9db5c1145e3fdb754e6ecdcf0930dccec375dda424c8b13f  lxqt-config-0.14.1.tar.xz"
diff --git a/user/lxqt-desktop/APKBUILD b/user/lxqt-desktop/APKBUILD
index 1ed4bb588..6ad593a75 100644
--- a/user/lxqt-desktop/APKBUILD
+++ b/user/lxqt-desktop/APKBUILD
@@ -14,17 +14,10 @@ depends="breeze breeze-icons oxygen ttf-liberation xorg-server dbus-x11 openbox
 	lxqt-notificationd lxqt-globalkeys lxqt-config lxqt-admin lxqt-about
 	lximage-qt lxqt-themes pavucontrol-qt qt5ct obconf-qt qps screengrab"
 makedepends=""
-install=""
 subpackages="$pkgname-doc"
 source="org.adelie-linux.about-lxqt.desktop startlxqt startlxqt.1"
-builddir="$srcdir/$pkgname-$pkgver"
-
-build() {
-	cd "$srcdir"
-}
 
 package() {
-	cd "$srcdir"
 	install -D -m644 "$srcdir"/org.adelie-linux.about-lxqt.desktop \
 		"$pkgdir"/usr/share/applications/org.adelie-linux.about-lxqt.desktop
 	install -D -m755 "$srcdir"/startlxqt "$pkgdir"/usr/bin/startlxqt
diff --git a/user/lxqt-globalkeys/APKBUILD b/user/lxqt-globalkeys/APKBUILD
index fbb90ad8d..da75788ad 100644
--- a/user/lxqt-globalkeys/APKBUILD
+++ b/user/lxqt-globalkeys/APKBUILD
@@ -15,11 +15,9 @@ subpackages="$pkgname-dev"
 source="https://github.com/lxqt/lxqt-globalkeys/releases/download/$pkgver/lxqt-globalkeys-$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 \
@@ -27,18 +25,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="205496c6be8fcefc4b0c7fc1beeac2a5ef996e1580d7662da6271149b3d26819b4db21260699bdd99db6a3e2874c7ac2670a6579c46985dcf6223ca6c98c125c  lxqt-globalkeys-0.14.3.tar.xz"
diff --git a/user/lxqt-l10n/APKBUILD b/user/lxqt-l10n/APKBUILD
index bba40dc92..b13843f75 100644
--- a/user/lxqt-l10n/APKBUILD
+++ b/user/lxqt-l10n/APKBUILD
@@ -14,11 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qttools-dev liblxqt-dev libqtxdg-dev
 source="https://github.com/lxde/lxqt-l10n/releases/download/$pkgver/lxqt-l10n-$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 \
@@ -26,13 +24,12 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS} ..
-	make
+		${CMAKE_CROSSOPTS} -Bbuild
+	make -C build
 }
 
 package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
 sha512sums="cbafc0f1c12a9c14af8ed896f5147d90fcd24786be0cc5de7f8897e31ac012a7308604622635f43709edeb13824395806e6d8e89355a0fd6799227f8d0d8f686  lxqt-l10n-0.13.0.tar.xz"
diff --git a/user/lxqt-notificationd/APKBUILD b/user/lxqt-notificationd/APKBUILD
index 3afe1be5b..137b19cf8 100644
--- a/user/lxqt-notificationd/APKBUILD
+++ b/user/lxqt-notificationd/APKBUILD
@@ -6,6 +6,7 @@ pkgrel=0
 pkgdesc="Daemon for notifications in LXQt"
 url="https://lxqt.org"
 arch="all"
+options="!check"  # No test suite.
 license="LGPL-2.1+"
 depends=""
 makedepends="cmake extra-cmake-modules qt5-qttools-dev liblxqt-dev>=${pkgver%.*}.0
@@ -13,11 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qttools-dev liblxqt-dev>=${pkgver%.*}
 source="https://github.com/lxqt/lxqt-notificationd/releases/download/$pkgver/lxqt-notificationd-$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="dcd1892ff66d6beb5c8953c6731f798a59272365fb7439277732b145cc9e6479314415481d9e8aae9fd670d779011c3d7bb3874b05a67cfad2a722f467866795  lxqt-notificationd-0.14.1.tar.xz"
diff --git a/user/lxqt-openssh-askpass/APKBUILD b/user/lxqt-openssh-askpass/APKBUILD
index 0312e7588..0778adc3d 100644
--- a/user/lxqt-openssh-askpass/APKBUILD
+++ b/user/lxqt-openssh-askpass/APKBUILD
@@ -15,11 +15,9 @@ subpackages="$pkgname-doc"
 source="https://github.com/lxde/lxqt-openssh-askpass/releases/download/$pkgver/lxqt-openssh-askpass-$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 \
@@ -27,18 +25,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="ab35cd719d4a31a495bed68a30cad5bf85701d223ee7306f0dad40717d0c2821af53e07a929b5855fb0cd680684fb790a638b59a1ea3ef288e0f656ab490b5bf  lxqt-openssh-askpass-0.14.1.tar.xz"
diff --git a/user/lxqt-panel/APKBUILD b/user/lxqt-panel/APKBUILD
index 934554989..8f8a38643 100644
--- a/user/lxqt-panel/APKBUILD
+++ b/user/lxqt-panel/APKBUILD
@@ -6,6 +6,7 @@ pkgrel=0
 pkgdesc="Panel for LXQt desktop"
 url="https://lxqt.org"
 arch="all"
+options="!check"  # No test suite.
 license="LGPL-2.1+"
 depends=""
 makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 kguiaddons-dev
@@ -17,11 +18,9 @@ subpackages="$pkgname-doc"
 source="https://github.com/lxqt/lxqt-panel/releases/download/$pkgver/lxqt-panel-$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 \
@@ -29,18 +28,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="e7cb361a13ac480cda50bc0549d5501f0d4f5bb6c8e257febf81550aaa88c0c55b615762aedb1f03fd654f79efe5aa2590b1dd592f6ae8c7e5a8d08086e0a687  lxqt-panel-0.14.1.tar.xz"
diff --git a/user/lxqt-policykit/APKBUILD b/user/lxqt-policykit/APKBUILD
index a1a1bd77e..7b677a646 100644
--- a/user/lxqt-policykit/APKBUILD
+++ b/user/lxqt-policykit/APKBUILD
@@ -16,11 +16,9 @@ subpackages="$pkgname-doc"
 source="https://github.com/lxqt/lxqt-policykit/releases/download/$pkgver/lxqt-policykit-$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 \
@@ -28,18 +26,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="c3df41a45ef4d04eba9ce0c9f29d4c9b68a192302e85e192a26ae73617b87d0ad70ec64135f500485d4c10095754e36935bf9790ffd83d0197b1bb784971a940  lxqt-policykit-0.14.1.tar.xz"
diff --git a/user/lxqt-powermanagement/APKBUILD b/user/lxqt-powermanagement/APKBUILD
index 89dd7b153..0b3097cdd 100644
--- a/user/lxqt-powermanagement/APKBUILD
+++ b/user/lxqt-powermanagement/APKBUILD
@@ -6,6 +6,7 @@ pkgrel=0
 pkgdesc="Power management utilities for LXQt"
 url="https://lxqt.org"
 arch="all"
+options="!check"  # No test suite.
 license="LGPL-2.1+"
 depends=""
 makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 upower-dev
@@ -14,11 +15,9 @@ makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 upower-dev
 source="https://github.com/lxqt/lxqt-powermanagement/releases/download/$pkgver/lxqt-powermanagement-$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 \
@@ -26,18 +25,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="04c72e8f73fff647f0a1d987db2879dffaeba7accfa320bc3b101befdb041ce391debd5f6de12cd2614f9ddc9bf07644d778bb33611a3a4690fe818f7bc81d10  lxqt-powermanagement-0.14.1.tar.xz"
diff --git a/user/lxqt-qtplugin/APKBUILD b/user/lxqt-qtplugin/APKBUILD
index 98aaa19cf..9d237c3f6 100644
--- a/user/lxqt-qtplugin/APKBUILD
+++ b/user/lxqt-qtplugin/APKBUILD
@@ -6,6 +6,7 @@ pkgrel=0
 pkgdesc="Qt plugin for platform integration with LXQt"
 url="https://lxqt.org/"
 arch="all"
+options="!check"  # No test suite.
 license="LGPL-2.1+"
 depends=""
 makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 qt5-qttools-dev
@@ -14,11 +15,9 @@ makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 qt5-qttools-dev
 source="https://github.com/lxqt/lxqt-qtplugin/releases/download/$pkgver/lxqt-qtplugin-$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 \
@@ -26,18 +25,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="33188bc03ee48a9b6e3cc5823cdcb5c96dba0cda65da511fe603d952c5de24e292cb02208cf357b04718df90f98d53bf48eaf6793d70d043214e429f57ccf53c  lxqt-qtplugin-0.14.0.tar.xz"
diff --git a/user/lxqt-runner/APKBUILD b/user/lxqt-runner/APKBUILD
index 3bb5b635f..7acd62c9b 100644
--- a/user/lxqt-runner/APKBUILD
+++ b/user/lxqt-runner/APKBUILD
@@ -6,6 +6,7 @@ pkgrel=0
 pkgdesc="Qt-based application launcher for LXQt"
 url="https://lxqt.org"
 arch="all"
+options="!check"  # No test suite.
 license="LGPL-2.1+"
 depends=""
 makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0
@@ -16,11 +17,9 @@ subpackages="$pkgname-doc"
 source="https://github.com/lxqt/lxqt-runner/releases/download/$pkgver/lxqt-runner-$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 \
@@ -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="62d196d37e87bc9154fa2cd9abcb8671277bffdb8673a6531bcb93161944cb8a31298587f8323d79a290292fc73765ea15990106828335879b87029ff1aba28c  lxqt-runner-0.14.1.tar.xz"
diff --git a/user/lxqt-session/APKBUILD b/user/lxqt-session/APKBUILD
index e3a44a552..d6cc987a0 100644
--- a/user/lxqt-session/APKBUILD
+++ b/user/lxqt-session/APKBUILD
@@ -6,6 +6,7 @@ pkgrel=0
 pkgdesc="Session management utilities for LXQt"
 url="https://lxqt.org"
 arch="all"
+options="!check"  # No test suite.
 license="LGPL-2.1+"
 depends="xdg-user-dirs"
 makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 eudev-dev
@@ -14,11 +15,9 @@ subpackages="$pkgname-doc"
 source="https://github.com/lxde/lxqt-session/releases/download/$pkgver/lxqt-session-$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 \
@@ -26,18 +25,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
 	rm "$pkgdir"/usr/bin/startlxqt
 	rm "$pkgdir"/usr/share/man/man1/start*
 }
diff --git a/user/lxqt-sudo/APKBUILD b/user/lxqt-sudo/APKBUILD
index d8b6904db..c65fe652c 100644
--- a/user/lxqt-sudo/APKBUILD
+++ b/user/lxqt-sudo/APKBUILD
@@ -15,11 +15,9 @@ subpackages="$pkgname-doc"
 source="https://github.com/lxqt/lxqt-sudo/releases/download/$pkgver/lxqt-sudo-$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 \
@@ -27,18 +25,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="b2741ead9c03c2dddf878b7658316ad0ce170068aca413b48b2f614e6ee09e7494e9907f7bf46de09c84e50b75cd523b059d47f9a0d2be11b340824475ca9222  lxqt-sudo-0.14.1.tar.xz"
diff --git a/user/lxqt-themes/APKBUILD b/user/lxqt-themes/APKBUILD
index beb54e53d..6881e5a4d 100644
--- a/user/lxqt-themes/APKBUILD
+++ b/user/lxqt-themes/APKBUILD
@@ -13,11 +13,9 @@ makedepends="cmake lxqt-build-tools>=0.6.0"
 source="https://github.com/lxde/lxqt-themes/releases/download/$pkgver/lxqt-themes-$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,13 +23,12 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS} ..
-	make
+		${CMAKE_CROSSOPTS} -Bbuild
+	make -C build
 }
 
 package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
 sha512sums="622449df60f5f50d59ab308a7aaae35114e91bda48e112fb2abb2c394bfdfc5794d2bf0c6ce63689a29081a31bdde191e3c8cb7217f833d76a407f9970eb1fb2  lxqt-themes-0.14.0.tar.xz"
diff --git a/user/menu-cache/APKBUILD b/user/menu-cache/APKBUILD
index 0ed6c1272..dd8b8a0f5 100644
--- a/user/menu-cache/APKBUILD
+++ b/user/menu-cache/APKBUILD
@@ -8,12 +8,12 @@ url="https://lxde.org/"
 arch="all"
 options="!check libtool"  # No test suite.
 license="GPL-2.0+"
+depends=""
 makedepends="glib-dev libfm-extra-dev"
 subpackages="$pkgname-dev"
 source="https://downloads.sourceforge.net/lxde/menu-cache/1.1/$pkgname-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -23,7 +23,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
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"
diff --git a/user/openbox/APKBUILD b/user/openbox/APKBUILD
index a062a6d26..7f763fdb1 100644
--- a/user/openbox/APKBUILD
+++ b/user/openbox/APKBUILD
@@ -17,13 +17,11 @@ source="http://openbox.org/dist/openbox/openbox-$pkgver.tar.gz
 	http://icculus.org/openbox/tools/setlayout.c"
 
 prepare() {
-	cd "$builddir"
-	update_config_sub
 	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -35,12 +33,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 	install "$builddir"/setlayout "$pkgdir"/usr/bin/setlayout
 }
diff --git a/user/pavucontrol-qt/APKBUILD b/user/pavucontrol-qt/APKBUILD
index 02c13c95f..e8254c58e 100644
--- a/user/pavucontrol-qt/APKBUILD
+++ b/user/pavucontrol-qt/APKBUILD
@@ -14,11 +14,9 @@ makedepends="cmake pulseaudio-dev qt5-qtbase-dev liblxqt-dev qt5-qttools-dev
 source="https://github.com/lxqt/pavucontrol-qt/releases/download/$pkgver/pavucontrol-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 \
@@ -26,13 +24,12 @@ build() {
 		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS} ..
-	make
+		${CMAKE_CROSSOPTS} -Bbuild
+	make -C build
 }
 
 package() {
-	cd "$builddir"/build
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" -C build install
 }
 
 sha512sums="55a8bceb31e07ceac7ab1fbb5f20101dfb087e58578039a238677e77f858e0564dca46efee2d5513a247c0be474f24d31e3afa9cf3cea0734feb0e56c33d5494  pavucontrol-qt-0.14.1.tar.xz"
diff --git a/user/pcmanfm-qt/APKBUILD b/user/pcmanfm-qt/APKBUILD
index 99718723f..a48274c4f 100644
--- a/user/pcmanfm-qt/APKBUILD
+++ b/user/pcmanfm-qt/APKBUILD
@@ -16,11 +16,9 @@ subpackages="$pkgname-doc"
 source="https://github.com/lxqt/pcmanfm-qt/releases/download/$pkgver/pcmanfm-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 \
@@ -28,18 +26,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="f3d170ab8344332f740a3245cc549ea0c3bddc97a45472dcd46208d59413dd42d3571821f309184417a34a627d2cb093fcaa335f782cf6e526eef3fcad212b3e  pcmanfm-qt-0.14.1.tar.xz"
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
diff --git a/user/qt5ct/APKBUILD b/user/qt5ct/APKBUILD
index 648792265..f54023654 100644
--- a/user/qt5ct/APKBUILD
+++ b/user/qt5ct/APKBUILD
@@ -13,13 +13,11 @@ makedepends="qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev"
 source="https://sourceforge.net/projects/qt5ct/files/qt5ct-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	qmake PREFIX=/usr
 	make
 }
 
 package() {
-	cd "$builddir"
 	make INSTALL_ROOT="$pkgdir" install
 }
 
diff --git a/user/qterminal/APKBUILD b/user/qterminal/APKBUILD
index f4881ad35..2ccd6bdf2 100644
--- a/user/qterminal/APKBUILD
+++ b/user/qterminal/APKBUILD
@@ -14,11 +14,9 @@ makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0
 source="https://github.com/lxqt/qterminal/releases/download/$pkgver/qterminal-$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 \
@@ -26,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="bb9ac6519236bb834892c1be50bc27f86631b2c7ed60c1ddd4300fedd48f3ea8a08aa453fa03199693486159f667f9391af9491dea5402b4f807ee91e8a6e5cf  qterminal-0.14.1.tar.xz"
diff --git a/user/qtermwidget/APKBUILD b/user/qtermwidget/APKBUILD
index 4a3d7cbc9..916d2e1f4 100644
--- a/user/qtermwidget/APKBUILD
+++ b/user/qtermwidget/APKBUILD
@@ -18,11 +18,9 @@ source="https://github.com/lxqt/qtermwidget/releases/download/$pkgver/qtermwidge
 	"
 
 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 \
@@ -31,18 +29,16 @@ build() {
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DQTERMWIDGET_USE_UTEMPTER=True \
-		${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="6b6d4abd6fc21f10f5323321f26132c0ff5b9682d09a086e265e57976deb60fca8db9a9906a29a0ed8d0e7b83417d5852df55d0118936d5f7a1342a9c2cb6410  qtermwidget-0.14.1.tar.xz
diff --git a/user/rrdtool/APKBUILD b/user/rrdtool/APKBUILD
index bec89b8ca..c4fdcd582 100644
--- a/user/rrdtool/APKBUILD
+++ b/user/rrdtool/APKBUILD
@@ -19,7 +19,6 @@ source="https://oss.oetiker.ch/$pkgname/pub/$pkgname-$pkgver.tar.gz
 	"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -33,12 +32,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	LANG=C.UTF-8 LC_ALL=C.UTF-8 TZ=UTC make check
 }
 
 package() {
-	cd "$builddir"
 	export INSTALLDIRS=vendor
 	make DESTDIR="$pkgdir" install
 	find "$pkgdir" -name '.packlist' -delete
@@ -52,7 +49,7 @@ dev() {
 }
 
 perl_rrd() {
-	depends=
+	depends=""
 	pkgdesc="Perl interface for rrdtool"
 	mkdir -p "$subpkgdir"/usr/lib \
 		"$pkgdir"/usr/share
@@ -61,7 +58,7 @@ perl_rrd() {
 }
 
 cached() {
-	depends=
+	depends=""
 	pkgdesc="RRDtool data caching daemon"
 	mkdir -p "$subpkgdir"/usr/sbin \
 		"$subpkgdir"/var/lib/rrdcached/db \
@@ -71,14 +68,14 @@ cached() {
 }
 
 cgi() {
-	depends=
+	depends=""
 	pkgdesc="Create web pages containing RRD graphs based on templates"
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/rrdcgi "$subpkgdir"/usr/bin
 }
 
 utils() {
-	depends=
+	depends=""
 	pkgdesc="RRDtool standalone utilities"
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/rrdinfo \
diff --git a/user/screengrab/APKBUILD b/user/screengrab/APKBUILD
index 167335214..721dad5a7 100644
--- a/user/screengrab/APKBUILD
+++ b/user/screengrab/APKBUILD
@@ -6,6 +6,7 @@ pkgrel=0
 pkgdesc="Cross-platform Qt-based software for taking screenshots"
 url="https://github.com/lxqt/screengrab"
 arch="all"
+options="!check"  # No test suite.
 license="GPL-2.0+"
 depends=""
 makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev
@@ -14,11 +15,9 @@ subpackages="$pkgname-doc"
 source="https://github.com/lxqt/screengrab/releases/download/$pkgver/screengrab-$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 \
@@ -26,18 +25,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="f253c4015f9c9ae6b53bb4919c0301cc843b0d6f6ab0b8ad88befbd397004aa4838d5900d1af86ed348cbba45fa352ded5192d494bd738c2f2b314e9ad73fb13  screengrab-1.101.tar.xz"
diff --git a/user/startup-notification/APKBUILD b/user/startup-notification/APKBUILD
index a52e6b549..6cc59febc 100644
--- a/user/startup-notification/APKBUILD
+++ b/user/startup-notification/APKBUILD
@@ -13,12 +13,11 @@ makedepends="libsm-dev libx11-dev xcb-util-dev"
 source="https://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.gz"
 
 prepare() {
-	cd "$builddir"
+	default_prepare
 	update_config_sub
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,12 +28,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/xdg-user-dirs/APKBUILD b/user/xdg-user-dirs/APKBUILD
index 1f717c632..241e80519 100644
--- a/user/xdg-user-dirs/APKBUILD
+++ b/user/xdg-user-dirs/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-lang $pkgname-doc"
 source="https://user-dirs.freedesktop.org/releases/xdg-user-dirs-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,7 +25,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }