Move MPICH path output later in the setup scripts

Because MPI is important of using OpenCoarrays, but CMake
is only important for building OpenCoarrays, we want to
ensure the MPI path precedes the CMake path in the PATH
variable in the setup scripts that the installer writes.
This lessens the likelihood of using a different MPI that
happens to be in the location of CMake (e.g., /usr/bin).

Author: Damian Rouson

prerequisites/install-functions/report_results.sh

@@ -63,14 +63,6 @@ report_results()
       echo "set LD_LIBRARY_PATH = (\"${compiler_lib_paths%/}\"/bin \"\$LD_LIBRARY_PATH\") " >> setup.csh
     fi
     echo "                                                                       " >> setup.sh
-    if [[ -x "$mpi_install_root/bin/mpif90" ]]; then
-      echo "if [[ -z \"\$PATH\" ]]; then                                         " >> setup.sh
-      echo "  export PATH=\"${mpi_install_root%/}/bin\"                        " >> setup.sh
-      echo "else                                                                 " >> setup.sh
-      echo "  export PATH=\"${mpi_install_root%/}/bin\":\$PATH                 " >> setup.sh
-      echo "fi                                                                   " >> setup.sh
-      echo "set path = (\"${mpi_install_root%/}\"/bin \"\$path\")              " >> setup.csh
-    fi
     if [[ -x "$cmake_install_path/cmake" ]]; then
       echo "if [[ -z \"\$PATH\" ]]; then                                         " >> setup.sh
       echo "  export PATH=\"${cmake_install_path%/}/\"                            " >> setup.sh
@@ -113,6 +105,14 @@ report_results()
       echo "fi                                                                   " >> setup.sh
       echo "set path = (\"$m4_install_path\"/bin \"\$path\")                      " >> setup.csh
     fi
+    if [[ -x "$mpi_install_root/bin/mpif90" ]]; then
+      echo "if [[ -z \"\$PATH\" ]]; then                                         " >> setup.sh
+      echo "  export PATH=\"${mpi_install_root%/}/bin\"                        " >> setup.sh
+      echo "else                                                                 " >> setup.sh
+      echo "  export PATH=\"${mpi_install_root%/}/bin\":\$PATH                 " >> setup.sh
+      echo "fi                                                                   " >> setup.sh
+      echo "set path = (\"${mpi_install_root%/}\"/bin \"\$path\")              " >> setup.csh
+    fi
     opencoarrays_install_path="${install_path}"
     if [[ -x "$opencoarrays_install_path/bin/caf" ]]; then
       echo "if [[ -z \"\$PATH\" ]]; then                                         " >> setup.sh