[xmds2] 01/02: Support hdf5 1.8.13 new packaging layout

[Rafael Laboissière]

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

rlaboiss-guest pushed a commit to branch master
in repository xmds2.

commit afb0ccfdbafd34f3af82a7b1b0aa9a35b2c9d315
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Fri Aug 1 15:47:46 2014 -0300

    Support hdf5 1.8.13 new packaging layout
    
    Thanks: Gilles Filippini for the patch
    Closes: 756702
---
 debian/rules | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 1430eba..c472ee2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,11 @@
 
 XMDS_USER_DATA = $(CURDIR)/debian/xmds-user-data
 
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+	HDF5_PATHS := --include-path=/usr/include/hdf5/serial \
+		--lib-path=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+endif
+
 #DH_VERBOSE=1
 
 %:
@@ -19,7 +24,7 @@ override_dh_auto_test:
           export OMPI_MCA_plm_rsh_agent=/bin/false ;	\
 	  mkdir bin-test ;				\
 	  install -m 755 bin/* bin-test ; 		\
-	  xmds2 --reconfigure ;				\
+	  xmds2 --reconfigure $(HDF5_PATHS) ;		\
 	  ./run_tests.py ;				\
 	  cd ./examples ;				\
 	  xmds2 lorenz.xmds ;				\

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/xmds2.git