[mpi-defaults] 04/05: d/rules: some dh magic didn't like the way I did it, so move code around to have it behaves as intended

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository mpi-defaults.

commit 7c09913e47ec9d231c32d5cd786a36b1c81328bd
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Wed Feb 10 11:10:30 2016 +0000

    d/rules: some dh magic didn't like the way I did it, so move code around to have it behaves as intended
---
 debian/rules | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index eb99330..808d4a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,17 @@
 #!/usr/bin/make -f
 
+export DH_VERBOSE=1
+
 MPI=$(shell readlink /etc/alternatives/mpi | sed s/usr//g | sed s/include//g | sed s/lib//g | sed s/\\///g)
 
 %:
 	dh $@
 
 override_dh_auto_build:
+	echo "# Default MPI implementation on this arch" >debian/debian_defaults
+	echo "ARCH_DEFAULT_MPI_IMPL=$(MPI)" >>debian/debian_defaults
+
+override_dh_gencontrol:
 	rm -f debian/*.substvars
 	if [ "$(MPI)" = "openmpi" ]; then \
 	  echo "mpi=openmpi-bin" > debian/mpi-default-bin.substvars; \
@@ -17,8 +23,7 @@ override_dh_auto_build:
 	  echo "Unknown MPI implementation, stopping"; \
 	  exit 1; \
 	fi
-	echo "# Default MPI implementation on this arch" >debian/debian_defaults
-	echo "ARCH_DEFAULT_MPI_IMPL=$(MPI)" >>debian/debian_defaults
+	dh_gencontrol
 
 override_dh_install:
 	dh_install -pmpi-default-dev debian/debian_defaults usr/share/mpi-default-dev/

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