[SCM] mpich.git branch, master, updated. debian/1.4.1-4-52-g2989efc

[Torquil Macdonald Sørensen]

The following commit has been merged in the master branch:
commit ec0fc55d8110b38a92cc15e9de70adb3e3738aaa
Author: Torquil Macdonald Sørensen <torquil at gmail.com>
Date:   Tue Jul 9 22:51:58 2013 +0200

    Multiarch changes for libmpich10.

diff --git a/debian/control b/debian/control
index 8b9dfee..0dd13d0 100644
--- a/debian/control
+++ b/debian/control
@@ -52,7 +52,10 @@ Description: Development files for MPICH
 
 Package: libmpich10
 Architecture: any
+Multi-Arch: same
 Section: libs
+Pre-Depends:
+ ${misc:Pre-Depends}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
diff --git a/debian/rules b/debian/rules
index 5327fc0..1d4bc0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 %:
 	dh $@  --parallel --with autoreconf
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 export MPICHLIB_CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 export MPICHLIB_CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
 export MPICHLIB_FFLAGS=$(shell dpkg-buildflags --get FFLAGS)
@@ -15,6 +17,7 @@ extra_flags += \
 	--enable-fc \
 	--disable-rpath \
 	--sysconfdir=/etc/mpich \
+	--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 	--includedir=/usr/include/mpich \
 	--docdir=/usr/share/doc/mpich \
 	--with-hwloc-prefix=system

-- 
mpich.git