[neon/qt6/qt6-declarative/Neon/release] debian: cludge it (even though declarative respeccts the ifeq statement)

Carlos De Maine null at kde.org
Mon Oct 28 06:10:43 GMT 2024


Git commit d4afac1ad7669dce761199ceda71d0b11db882dd by Carlos De Maine.
Committed on 28/10/2024 at 06:10.
Pushed by carlosdem into branch 'Neon/release'.

cludge it (even though declarative respeccts the ifeq statement)

M  +9    -8    debian/rules

https://invent.kde.org/neon/qt6/qt6-declarative/-/commit/d4afac1ad7669dce761199ceda71d0b11db882dd

diff --git a/debian/rules b/debian/rules
index e839b6b..19c613b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,15 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto
 #### uncomment when bootstrapping a new qt release ####
 #export DEB_BUILD_PROFILES := ${DEB_BUILD_PROFILES} nodoc
 
+
+ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)),)
+override_dh_auto_build-indep:
+	dh_auto_build
+
+override_dh_auto_install-indep:
+	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
+endif
+
 # QT_HOST_PATH isn't passed in cross-builds
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 	extra_cmake_args += \
@@ -27,13 +36,6 @@ override_dh_auto_configure:
 		-DQT_UNITY_BUILD=ON \
 		$(extra_cmake_args)
 
-ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
-override_dh_auto_build-indep:
-	dh_auto_build
-
-override_dh_auto_install-indep:
-	DESTDIR=$(CURDIR)/debian/tmp dh_auto_build -- install
-else
 override_dh_auto_build-indep:
 	dh_auto_build -- docs
 
@@ -42,7 +44,6 @@ override_dh_auto_install-indep:
 	# Remove build path from index files.
 	find $(CURDIR)/debian/tmp/usr/share/qt6/doc -type f -name *.index -exec \
                 sed -i 's@$(CURDIR)/@@g' {} \;
-endif
 
 execute_after_dh_auto_install-arch:
 	# Reproducible builds: remove build paths from .prl files


More information about the Neon-commits mailing list