Merge lp:~peter-pearse/ubuntu/natty/acl/prop002 into lp:ubuntu/natty/acl

[Peter Pearse]

Pass --host & --build for cross builds.
ONLY to cross builds as per comment from Steve Langasek

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-28 22:15:20 +0000
+++ debian/changelog	2011-02-22 17:05:03 +0000
@@ -1,3 +1,9 @@
+acl (2.2.49-4ubuntu1) natty; urgency=low
+
+  * Pass host & build to allow cross builds to succeed
+
+ -- Peter Pearse <[e-mail]>  Fri, 28 Jan 2011 17:11:25 +0000
+
 acl (2.2.49-4) unstable; urgency=low
 
   * Migrate to having binaries in sbindir (closes: #590240)

=== modified file 'debian/rules'
--- debian/rules	2010-02-02 11:40:55 +0000
+++ debian/rules	2011-02-22 17:05:03 +0000
@@ -18,6 +18,15 @@
 	  INSTALL_USER=root INSTALL_GROUP=root ;
 checkdir = test -f debian/rules
 
+# Ensure cross builds succeed
+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))
+  LOCAL_CONFIGURE_OPTIONS += --build $(DEB_HOST_GNU_TYPE)
+else
+  LOCAL_CONFIGURE_OPTIONS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
 build: built
 built: config
 	@echo "== dpkg-buildpackage: build" 1>&2
@@ -29,7 +38,7 @@
 .census:
 	@echo "== dpkg-buildpackage: configure" 1>&2
 	$(checkdir)
-	$(options) $(MAKE) configure
+	$(options) $(MAKE) configure LOCAL_CONFIGURE_OPTIONS="$(LOCAL_CONFIGURE_OPTIONS)"
 	touch .census
 
 clean: