[netcdf] 04/15: Fix to build libs right

[Alastair McKinstry]

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

mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.

commit 96716f1fadda03d0c17dc5d7a23b604e3284ffd1
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Jun 6 03:44:31 2014 +0100

    Fix to build libs right
---
 debian/rules | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index 03f22df..0b5f870 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,34 +8,43 @@ export DH_VERBOSE=1
 include /usr/share/mpi-default-dev/debian_defaults
 MPI:=${ARCH_DEFAULT_MPI_IMPL}
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIB:=/usr/lib/${DEB_HOST_MULTIARCH}
+
 override_dh_auto_configure:
 	dh_auto_configure --builddirectory=build-serial -- \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	-DENABLE_DAP:BOOL=ON \
 	-DENABLE_DAP_REMOTE_TESTS:BOOL=OFF \
-	-DENABLE_TESTS:BOOL=OFF \
+	-DENABLE_TESTS:BOOL=ON \
 	-DENABLE_DOXYGEN:BOOL=OFF \
 	-DUSE_PARALLEL=OFF \
 	-DHDF5_C_INCLUDE_DIR="/usr/include/serial/hdf5" \
-	-DHDF5_HL_INCLUDE_DIR="/usr/include/serial/hdf5" 
-	-DHDF5_LIBRARIES:STRING="hdf5_serial hdf5_serial_hl"
-	# -DENABLE_PARALLEL=OFF \
+	-DHDF5_HL_INCLUDE_DIR="/usr/include/serial/hdf5" \
+	-DHDF5_hdf5_hl_LIBRARY_RELEASE=${LIB}/libhdf5_serial_hl.so \
+	-DHDF5_hdf5_LIBRARY_RELEASE=${LIB}/libhdf5_serial.so
 	dh_auto_configure --builddirectory=build-mpi --  \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	-DENABLE_DAP_REMOTE_TESTS:BOOL=OFF \
 	-DENABLE_PARALLEL_TESTS:BOOL=OFF \
 	-DENABLE_TESTS:BOOL=OFF \
 	-DENABLE_DOXYGEN:BOOL=ON \
+	-DUSE_PARALLEL=ON \
         -DHDF5_C_INCLUDE_DIR="/usr/include/${MPI}/hdf5" \
         -DHDF5_HL_INCLUDE_DIR="/usr/include/${MPI}/hdf5" \
-	-DHDF5_LIBRARIES:STRING="hdf5_${MPI} hdf5_${MPI}_hl" \
+	-DHDF5_hdf5_hl_LIBRARY_RELEASE=${LIB}/libhdf5_${MPI}_hl.so \
+	-DHDF5_hdf5_LIBRARY_RELEASE=${LIB}/libhdf5_${MPI}.so \
 	-DCMAKE_C_COMPILER=mpicc 
 
 override_dh_auto_build:
 	$(MAKE) -C build-serial
 	$(MAKE) -C build-mpi
 
-oveeride_dh_auto_clean:
+override_dh_auto_test:
+	$(MAKE) -C build-serial test
+	$(MAKE) -C build-mpi test
+
+override_dh_auto_clean:
 	rm -rf build-*
 
 #install/libnetcdf7::

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