Import Debian changes 1.9-2.1

[debian/gzip] / debian / rules

diff --git a/debian/rules b/debian/rules
index 2354cc248c9ad0214265512d49789dc7453070d6..6936ecb71696c88546e352000fd5cb34ef8b7c45 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,9 +10,7 @@ export DH_VERBOSE=1
 shellescape='$(subst ','\'',$(1))'
 shellexport=$(1)=$(call shellescape,${$(1)})
 
-DEB_BUILD_ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+include /usr/share/dpkg/architecture.mk
 
 # Automatic ${CC} selection for cross-compiles
 
@@ -26,6 +24,7 @@ CC=                   gcc
 endif
 endif
 
+export DEFS=NO_ASM # Avoid TEXTRELs on i386
 EXTRA_CFLAGS=          -Wall
 EXTRA_CPPFLAGS=