[hdf5] 20/24: Ensure all includes go into /usr/include/@FLAVOR@/hdf5

[Alastair McKinstry]

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

mckinstry pushed a commit to branch dev-alternatives
in repository hdf5.

commit 403ce19ccd3398f6b2fc741ee0483b0cca94fb27
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Jun 4 09:10:03 2014 +0100

    Ensure all includes go into /usr/include/@FLAVOR@/hdf5
---
 debian/rules | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 71da1dc..0ecabf0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -88,9 +88,9 @@ CONFIGURE_FLAGS = --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) \
 		  --enable-shared --enable-production=$(USE_PROD) \
 		  --disable-sharedlib-rpath --with-zlib --with-default-api-version=v18 \
 		  --enable-fortran
-SERIAL_FLAGS = --enable-threadsafe --enable-cxx --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --with-flavor=serial
-OPENMPI_FLAGS = --enable-parallel=yes --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --includedir=\$${prefix}/include/openmpi --with-flavor=openmpi
-MPICH_FLAGS = --enable-parallel=yes --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --includedir=\$${prefix}/include/mpich --with-flavor=mpich
+SERIAL_FLAGS = --enable-threadsafe --enable-cxx --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --includedir=\$${prefix}/include/serial/hdf5 --with-flavor=serial
+OPENMPI_FLAGS = --enable-parallel=yes --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --includedir=\$${prefix}/include/openmpi/hdf5 --with-flavor=openmpi
+MPICH_FLAGS = --enable-parallel=yes --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --includedir=\$${prefix}/include/mpich/hdf5 --with-flavor=mpich
 
 configure: configure-stamp-debian configure-stamp \
 	   $(configure_stamp_openmpi) configure-stamp-mpich
@@ -223,8 +223,6 @@ install-serial: build-stamp
 	dh_testroot
 	-mkdir debian/build/tmpinst
 	$(MAKE) -C debian/build/ install prefix=$(CURDIR)/debian/build/tmpinst/usr
-	-mkdir -p debian/build/tmpinst/usr/include/serial/hdf5
-	mv debian/build/tmpinst/usr/include/*.h debian/build/tmpinst/usr/include/*.mod debian/build/tmpinst/usr/include/serial/hdf5
 	chrpath -d $(CURDIR)/debian/build/tmpinst/usr/lib/*/libhdf5*so*
 	dh_install -p$(serpack) -p$(package)-dev -phdf5-helpers -phdf5-tools -p$(sercpppack) \
 		--sourcedir=debian/build/tmpinst

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git