[h5py] 01/03: d/{control,rules}: use pkg-config for hdf5 flags

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/experimental
in repository h5py.

commit c3d29616db1e88c617c684cf478cfa8de600dc89
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Sun Mar 29 12:22:35 2015 +0100

    d/{control,rules}: use pkg-config for hdf5 flags
    
    As kindly suggested by Frederic-Emmanuel PICCA.
---
 debian/control | 3 ++-
 debian/rules   | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 0c951b0..7f3354e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Build-Depends: debhelper (>= 9),
                python-numpy (>= 1:1.7.1-1~),
                python3-numpy (>= 1:1.7.1-1~),
                cython,
-               cython3
+               cython3,
+               pkg-config
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/h5py.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/h5py.git
diff --git a/debian/rules b/debian/rules
index 955ce61..aefcd82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,10 +7,8 @@ export PYBUILD_NAME=h5py
 export PYBUILD_AFTER_INSTALL_python2=dh_numpy
 export PYBUILD_AFTER_INSTALL_python3=dh_numpy3
 
-ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
-  export CPPFLAGS=-I/usr/include/hdf5/serial
-  export LDFLAGS=-Wl,-L/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
-endif
+export CFLAGS=$(shell pkg-config --cflags hdf5)
+export LDFLAGS=$(shell pkg-config --libs hdf5)
 
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild

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