[neon/3rdparty/libaccounts-qt/Neon/unstable] debian: Fix qt_SELECT

Scarlett Moore null at kde.org
Tue Sep 19 17:14:03 BST 2023


Git commit c3214d39c61fcc6ab343e1e8dfa928fcda8984db by Scarlett Moore.
Committed on 19/09/2023 at 18:13.
Pushed by scarlettmoore into branch 'Neon/unstable'.

Fix qt_SELECT

M  +2    -5    debian/rules

https://invent.kde.org/neon/3rdparty/libaccounts-qt/-/commit/c3214d39c61fcc6ab343e1e8dfa928fcda8984db

diff --git a/debian/rules b/debian/rules
index 553c09e..c12b828 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,15 +12,12 @@ override_dh_auto_clean:
 	-dh_auto_clean -- cleandocs
 	dh_auto_clean
 
-execute_after_dh_auto_clean:
-	rm -rf build6
-	rm -rf build
 
 override_dh_auto_configure:
 #	mkdir -p build && cd build && qmake "QMAKE_CFLAGS_RELEASE=${CFLAGS} ${CPPFLAGS}" "QMAKE_CFLAGS_DEBUG=${CFLAGS} ${CPPFLAGS}" "QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} ${CPPFLAGS}" "QMAKE_CXXFLAGS_DEBUG=${CXXFLAGS} ${CPPFLAGS}" "QMAKE_LFLAGS_RELEASE=${LDFLAGS}" "QMAKE_LFLAGS_DEBUG=${LDFLAGS}" QMAKE_STRIP=: PREFIX=/usr .. && cd ..
-	mkdir -p build6 && cd build6 && QT_SELECT=qt6 qmake6 .. -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+	mkdir -p build6 && cd build6 && QT_SELECT=6 qmake6 .. -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 	#mkdir -p build && cd build && QT_SELECT=qt5 qmake .. -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
-	mkdir -p build && cd build && QT_SELECT=qt5 qmake .. -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+	mkdir -p build && cd build && QT_SELECT=5 qmake .. -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_build:
 	cd build6 && make


More information about the Neon-commits mailing list