[med-svn] [relion] 22/36: d/rules: Use dh_auto_configure and include architecture.mk

[Roland Fehrenbacher]

This is an automated email from the git hooks/post-receive script.

rfehren-guest pushed a commit to branch master
in repository relion.

commit 87356c0594701e34eefe8eab247ee27cb7ae179b
Author: Roland Fehrenbacher <rf at q-leap.de>
Date:   Sat Oct 11 23:31:31 2014 +0000

    d/rules: Use dh_auto_configure and include architecture.mk
---
 debian/rules | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index e6c57b7..d294912 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@
 #export DH_VERBOSE=1
 
 DEBVENDOR  := $(shell dpkg-vendor --query Vendor)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 ifeq ($(DEBVENDOR), Qlustar)
     # Qlustar specific stuff
@@ -15,8 +14,11 @@ else
     MPICXX := mpicxx.openmpi
 endif
 
-CONFIGURE_COMMON := ./configure --prefix=/usr \
-    --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) -program-prefix="relion_" 
+# include defs of all DEB_HOST_*/DEB_BUILD_* vars
+include /usr/share/dpkg/architecture.mk
+
+CONFIGURE_COMMON := dh_auto_configure -- \
+  --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) -program-prefix="relion_" 
 
 %:
 	dh $@ --parallel --with autoreconf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/relion.git