Remove temporary files.

[simgrid.git] / src / smpi / smpiff.in

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 54e63ee..9e78970 100644 (file)
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -6,18 +6,12 @@
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the license (GNU LGPL) which comes with this package.
 
-<<<<<<< HEAD
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
 
-prefix="@exec_prefix@"
-smpicc="$prefix/bin/smpicc"
-smpif2c="$prefix/bin/smpif2c"
-=======
 F77=@GFORTRAN_EXE@
 
 INCLUDEARGS="@includeflag@"
 CMAKE_LINKARGS="-L@libdir@"
->>>>>>> 167177a9f2980982c1bb3f89ec90fc1937395cd5
 
 @SMPITOOLS_SH@
 
@@ -28,7 +22,7 @@ main_name=main
 
 cleanup () {
     eval $(list_get TMPFILES)
-   # rm -f "$@"
+    rm -f "$@"
 }
 trap 'cleanup' EXIT
 
@@ -52,8 +46,7 @@ while [ $# -gt 0 ]; do
             list_add CMDLINE "${SRCFILE}"
             ;;
         '-version' | '--version' | '-v')
-            # -e is not recognised by MS-DOS...
-            echo -e $SIMGRID_VERSION
+            printf '%b\n' "$SIMGRID_VERSION"
             exit 0
             ;;           
         *)