[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.9.1_rc1+git20110514.347379b+dfsg-1-10-g66c92db

[Julien Valroff]

The following commit has been merged in the master branch:
commit 66c92dbcdeea14b146bd81fe8951d4455b881ccb
Author: Julien Valroff <julien at kirya.net>
Date:   Sat Jun 18 08:09:35 2011 +0200

    Simplify rules file

diff --git a/debian/rules b/debian/rules
index 8487d9a..7cb3774 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,13 +36,8 @@ endif
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
-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))
-        CROSS = --build=$(DEB_HOST_GNU_TYPE)
-else
-        CROSS = --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
+DEB_HOST_GNU_TYPE   := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 LDFLAGS := -Wl,-z,defs -Wl,--as-needed
 
@@ -50,7 +45,7 @@ LDFLAGS := -Wl,-z,defs -Wl,--as-needed
 	dh $@ --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(CROSS) $(CONFIGURE)
+	dh_auto_configure -- --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) $(CONFIGURE)
 
 	# dh_install does not support renaming
 	ln contrib/dspam_maintenance/dspam_maintenance.sh contrib/dspam_maintenance/dspam_maintenance

-- 
Debian packages for the DSPAM anti-spam filter