[neon/qt6/qt6-tools/Neon/release] debian: cludge it

Carlos De Maine null at kde.org
Mon Oct 28 06:08:38 GMT 2024


Git commit 22b83957c8313c5b9044f671e89c5696d432130c by Carlos De Maine.
Committed on 28/10/2024 at 05:44.
Pushed by carlosdem into branch 'Neon/release'.

cludge it

M  +8    -8    debian/rules

https://invent.kde.org/neon/qt6/qt6-tools/-/commit/22b83957c8313c5b9044f671e89c5696d432130c

diff --git a/debian/rules b/debian/rules
index 64c105d..f22f5ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,14 @@ export LLVM_INSTALL_DIR := $(shell llvm-config --prefix)
 #### 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))
 	cmake_extra_args += \
@@ -31,13 +39,6 @@ override_dh_auto_configure:
 		$(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
 
@@ -46,7 +47,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
 
 override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info


More information about the Neon-commits mailing list