* Explicitly pass the system type to configure always.

diff --git a/debian/changelog b/debian/changelog
index 7d3e7e7b1c5a9ebe7cfd7d52cb5f8bb2d8e0d197..a58e36da82e08b69e89da0c03804cdfe02407e2e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kftgt (1.12-2) unstable; urgency=low
+
+  * Explicitly pass the system type to configure always.
+
+ --
+
 kftgt (1.12-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/rules b/debian/rules
index df2a5635c37ef3009f0bdc296df6da66dc006c6b..70f238b66696b12053363c9d2018e06252f2b68a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,15 @@ include /usr/share/dpatch/dpatch.make
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# Tell Autoconf the correct system types.
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+    SYSTEM = --build $(DEB_HOST_GNU_TYPE)
+else
+    SYSTEM = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
 CFLAGS = -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     CFLAGS += -O0
@@ -22,7 +31,7 @@ build-arch: patch build-stamp
 build-indep:
 build-stamp:
        dh_testdir
-       CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
+       CFLAGS="$(CFLAGS)" ./configure $(SYSTEM) --prefix=/usr \
            --mandir=\$${prefix}/share/man --enable-reduced-depends
        $(MAKE)
        touch build-stamp