X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2e5c116ea4ed6939a1ad463c42faa7920a155c51..2bcb5dd3317c733c31c288ae79e72fb28863d936:/src/smpi/smpiff.in

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 6dceb77106..7ab94130a3 100644
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -9,7 +9,7 @@
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
 SIMGRID_GITHASH="@SIMGRID_GITHASH@"
 
-F77=@GFORTRAN_EXE@
+F77=@SAVED_Fortran_COMPILER@
 
 INCLUDEARGS="@includeflag@"
 CMAKE_LINKARGS="-L@libdir@"
@@ -31,10 +31,10 @@ filter_and_compile() {
     list_add TMPFILES "${TMPFILE}"
     #replace "program main_name by subroutine user\_main (and the end clause as well)"
     if [ $TRACE_CALL_LOCATION -gt 0 ]; then
-      echo "#include \"/tmp/local/include/smpi/smpi_extended_traces_fortran.h\"" > ${TMPFILE}
+      echo "#include \"@includedir@/smpi/smpi_extended_traces_fortran.h\"" > ${TMPFILE}
     echo "#line 1 \"${ARG}\"" >> ${TMPFILE}
     fi
-    sed 's/[[:space:]]\{6\}[[:space:]]*\(end \)\{0,1\}program[[:space:]]*\([a-zA-Z0-9\-\_]*\)/      \1subroutine user_main /gI;s/[[:space:]]*use[[:space:]]*mpi/\include \"mpif\.h\" /gI' "${ARG}" >> "${TMPFILE}"
+    sed 's/[[:space:]]\{6\}[[:space:]]*\([eE][nN][dD] \)\{0,1\}[pP][rR][oO][gG][rR][aA][mM][[:space:]]*\([a-zA-Z0-9\-\_]*\)/      \1subroutine user_main /g;s/[[:space:]]*[uU][sS][eE][[:space:]]*[mM][pP][iI]/\include \"mpif\.h\" /g' "${ARG}" >> "${TMPFILE}"
     SRCFILE="${TMPFILE}"
     list_add CMDLINE "${SRCFILE}"
 }
@@ -81,7 +81,8 @@ while [ $# -gt 0 ]; do
             ;;
         -o)
             NEEDS_OUTPUT=0
-            list_add CMDLINE "-o"   
+            list_add CMDLINE "-o$1"
+            shift
             ;;        
         *)
             list_add CMDLINE "${ARG}"