[mpich] 05/23: Updates to override_dh_auto_install-arch target

[Torquil Macdonald Sørensen]

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

torquil-guest pushed a commit to branch master
in repository mpich.

commit 284652bfaff2a912ea3986a34040ddafe071415b
Author: Torquil Macdonald Sørensen <torquil at gmail.com>
Date:   Thu Nov 5 12:41:51 2015 +0100

    Updates to override_dh_auto_install-arch target
---
 debian/rules | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index b169b2a..bbcc3f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,13 +53,20 @@ override_dh_auto_build-indep:
 
 override_dh_auto_install-arch:
 	dh_auto_install -a
-	for i in mpicc mpicxx mpif77 mpif90; do \
+
+	# Rename executables (ignore upstream symlinks)
+	for i in mpicc mpicxx mpifort; do \
 	  (cd debian/tmp/usr/bin/ && mv $$i $$i.mpich); \
+	done
+
+    # Rename manpages
+	for i in mpicc mpicxx mpiexec mpif77 mpifort; do \
 	  (cd debian/tmp/usr/share/man/man1/ && mv $$i.1 $$i.mpich.1);\
 	done
-	# Fix incorrect paths in /usr/bin/mpi{cc,cxx,f77,f90}.mpich
+
+	# Fix incorrect paths in /usr/bin/mpi{cc,cxx,fort}.mpich
 	for fn in debian/tmp/usr/bin/mpicc.mpich debian/tmp/usr/bin/mpicxx.mpich \
-		debian/tmp/usr/bin/mpif77.mpich debian/tmp/usr/bin/mpif90.mpich; do \
+		debian/tmp/usr/bin/mpifort.mpich; do \
 		sed -i 's:$(CURDIR)/debian/tmp/::g' $$fn ;\
 	done
 	mv debian/tmp/usr/share/man/man1/mpiexec.1 debian/tmp/usr/share/man/man1/mpiexec.mpich.1

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