b0ad6c
--- mpich-3.2.1/src/packaging/envmods/mpich.module.in.orig	2017-11-11 03:19:44.000000000 +0100
b0ad6c
+++ mpich-3.2.1/src/packaging/envmods/mpich.module.in	2018-04-04 14:14:16.553160669 +0200
b0ad6c
@@ -3,12 +3,23 @@
b0ad6c
 #  MPICH module for use with 'environment-modules' package:
b0ad6c
 # 
b0ad6c
 
b0ad6c
+# Only allow one mpi module to be loaded at a time
b0ad6c
+conflict mpi
b0ad6c
+
b0ad6c
 # Define prefix so PATH and MANPATH can be updated.
b0ad6c
-setenv        prefix        @prefix@
b0ad6c
-setenv        exec_prefix   @exec_prefix@
b0ad6c
+setenv        MPI_BIN       @LIBDIR@/bin
b0ad6c
+setenv        MPI_SYSCONFIG @sysconfdir@/@MPINAME@-@ARCH@
b0ad6c
+setenv        MPI_FORTRAN_MOD_DIR @fortranmoddir@/@MPINAME@
b0ad6c
+setenv        MPI_INCLUDE   @includedir@
b0ad6c
+setenv        MPI_LIB       @libdir@
b0ad6c
+setenv        MPI_MAN       @mandir@
b0ad6c
+setenv        MPI_PYTHON_SITEARCH	@py3sitearch@/@MPINAME@
b0ad6c
+setenv        MPI_PYTHON2_SITEARCH	@py3sitearch@/@MPINAME@
b0ad6c
+setenv        MPI_PYTHON3_SITEARCH	@py3sitearch@/@MPINAME@
b0ad6c
+setenv        MPI_COMPILER  @MPINAME@-@ARCH@
b0ad6c
+setenv        MPI_SUFFIX    _@MPINAME@
b0ad6c
+setenv        MPI_HOME      @LIBDIR@
b0ad6c
 prepend-path  PATH          @bindir@
b0ad6c
-prepend-path  MANPATH       @mandir@
b0ad6c
-
b0ad6c
-# Undefine prefix and exec_prefix which are too generic environment variables.
b0ad6c
-unsetenv      prefix
b0ad6c
-unsetenv      exec_prefix
b0ad6c
+prepend-path  LD_LIBRARY_PATH @libdir@
b0ad6c
+prepend-path  MANPATH       :@mandir@
b0ad6c
+prepend-path  PKG_CONFIG_PATH @LIBDIR@/lib/pkgconfig