cross-building: Do not include a makefile

diff --git a/debian/changelog b/debian/changelog
index 17c0bddff4270848e6c29323979eadc86b8d70f5..6dd33568e20de7d7e7a642fa7b394ac47208f95e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ authbind (2.1.2~) unstable; urgency=low
   * Fix one-letter typo in previous changelog entry.
   * Add -n to gzip -9 rune, to help reproducibility.  Closes:#777727.
   * Fix FTCBFS: Use triplet-prefixed build tools.
-    Patch from Helmut Grohne.  Closes: #851206.
+    Patch from Helmut Grohne, modified.  Closes: #851206.
 
  --
 

diff --git a/debian/rules b/debian/rules
index 625f4b1ca217349d11466f71932d635e8e5529b7..b4f4dc5f367397359ebfcd279106f9e4d2003515 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -20,13 +20,6 @@
 #
 # $Id$
 
--include /usr/share/dpkg/architecture.mk
-ifneq ($(DEB_HOST_GNU_TYPE),)
-TOOL_PREFIX=$(DEB_HOST_GNU_TYPE)-
-endif
-ifeq ($(origin CC),default)
-CC=$(TOOL_PREFIX)gcc
-endif
 SHELL=/bin/bash
 
 package=authbind
@@ -35,6 +28,11 @@ minor=0
 
 arch = $(shell dpkg --print-architecture)
 
+TOOL_PREFIX = $(shell set -x; a=`dpkg-architecture -q DEB_HOST_GNU_TYPE`; echo $$a$${a+-})
+ifeq ($(origin CC),default)
+CC=$(TOOL_PREFIX)gcc
+endif
+
 export SOURCE_DATE_EPOCH = $(shell date -d "$$(dpkg-parsechangelog --count 1 -SDate)" +%s)
 
 INSTALL = install