[Debian-ha-commits] [pacemaker] 03/09: Added instruction for setting DEB_HOST_MULTIARCH variable

[Richard Winters]

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

devrik-guest pushed a commit to branch master
in repository pacemaker.

commit 22670b424033be4ddf67e54a2e2098ef95ae9068
Author: Richard B Winters <rik at mmogp.com>
Date:   Tue Apr 28 17:57:32 2015 -0400

    Added instruction for setting DEB_HOST_MULTIARCH variable
    
     - Updated instances of '/usr/lib/' through the rules file to
       read '/usr/lib/$(DEB_HOST_MULTIARCH)/'
    
    Change-Id: I1048d998d57c57c2923678e2f59827789100d161
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/rules | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index bf9b66e..1a7812c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,11 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 # Ensure that we link against all needed libraries (cf. Policy 10.2)
 #export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs
 
+# Because we use --libexecdir in dh_auto_configure and thus specify
+# /usr/lib, we need to set DEB_HOST_MULTIARCH and tac said flag on to
+# the end so that triplet paths are supported
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) 
+
 # main packaging script based on dh7 syntax
 %:
 	dh $@ --with autoreconf,python2,systemd --fail-missing --link-doc=pacemaker
@@ -18,8 +23,8 @@ override_dh_autoreconf:
 	dh_autoreconf ./autogen.sh
 
 override_dh_auto_configure:
-	dh_auto_configure -- --prefix=/usr --libexecdir=/usr/lib/ --localstatedir=/var \
-	    --sysconfdir=/etc --libdir=/usr/lib --docdir=/usr/share/doc/pacemaker \
+	dh_auto_configure -- --prefix=/usr --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/ --localstatedir=/var \
+	    --sysconfdir=/etc --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --docdir=/usr/share/doc/pacemaker \
 	    --disable-fatal-warnings --enable-dependency-tracking --enable-glib-malloc \
 	    --with-snmp --with-esmtp --enable-snmp-subagent --with-mibsdir=/usr/share/snmp/mibs \
 	    --with-corosync --with-cs-quorum

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