Index: /issm/trunk-jpl/etc/environment.sh
===================================================================
--- /issm/trunk-jpl/etc/environment.sh	(revision 24634)
+++ /issm/trunk-jpl/etc/environment.sh	(revision 24635)
@@ -185,6 +185,5 @@
 
 MPI_DIR="${ISSM_DIR}/externalpackages/mpich/install"
-if [ -d "$MPI_DIR" ]; then
-	echo "HERE"
+if [ -d "${MPI_DIR}" ]; then
 	export MPI_DIR
 	export MPI_INC_DIR="$MPI_DIR/include"
@@ -197,10 +196,13 @@
 if [ -d "$PETSC_DIR" ]; then
 	export PETSC_DIR
-	path_prepend "${PETSC_DIR}/bin" # In case we have installed MPICH via PETSc
 	ld_library_path_append "${PETSC_DIR}/lib"
-	if [ -f "$PETSC_DIR/bin/mpiexec" ]; then
-		MPI_DIR=$PETSC_DIR
+
+	# In case we have installed MPICH via PETSc
+	if [ -f "${PETSC_DIR}/bin/mpiexec" ]; then
+		MPI_DIR=${PETSC_DIR}
 		export MPI_DIR
-		export MPI_INC_DIR="$MPI_DIR/include"
+		export MPI_INC_DIR="${MPI_DIR}/include"
+		path_prepend "${MPI_DIR}/bin"
+		cpath_prepend "${MPI_DIR}/include"
 	fi
 fi