[SCM] qttools packaging branch, master, updated. debian/5.9.2-5-9-gcc3584c

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qttools.git;a=commitdiff;h=cc3584c

The following commit has been merged in the master branch:
commit cc3584c04a45f8acfaf97c89ce4007f90f7988e5
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jan 19 17:48:06 2018 +0300

    Bootstrap the internal documentation only for native builds.
    
    The code will not work for cross builds as it builds the tools for
    build architecture.
---
 debian/rules | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 8f2d4ee..997b67a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
 
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
@@ -33,12 +33,14 @@ override_dh_auto_build-indep: build-doc-tools
 	cd src/assistant/help; qmake
 	dh_auto_build -- docs
 
+ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
 override_dh_auto_build-arch: build-doc-tools
 	# Rebuild the internal assistant.qch which is used as a resource
 	cd src/assistant/assistant/doc/internal; qmake
 	dh_auto_build -- -Csrc/assistant/assistant/doc/internal docs
 	mv doc/assistant.qch src/assistant/assistant/assistant.qch
 	dh_auto_build
+endif
 
 override_dh_auto_install-arch:
 	dh_auto_install

-- 
qttools packaging