X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea74f5d95928a521a588737e81f1de94eef25d19..abf3b21ad3f4a19475431076e6e2b26f76d2e7d6:/src/smpi/smpiff.in

diff --git a/src/smpi/smpiff.in b/src/smpi/smpiff.in
index 6bb53c02ae..17c4c82440 100644
--- a/src/smpi/smpiff.in
+++ b/src/smpi/smpiff.in
@@ -1,20 +1,20 @@
 #!/usr/bin/env sh
 
-# Copyright (c) 2012-2022. The SimGrid Team. All rights reserved.
+# Copyright (c) 2012-2023. The SimGrid Team. All rights reserved.
 
 # 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.
 
 SIMGRID_VERSION="@SIMGRID_VERSION_STRING@"
-SIMGRID_GITHASH="@SIMGRID_GITHASH@"
+SIMGRID_GITHASH="@GIT_VERSION@"
 
 REAL_FORTRAN_COMPILER=@SMPI_Fortran_COMPILER@
 
-INCLUDEARGS="@includeflag@"
-CMAKE_LINKARGS="-L@libdir@"
-
 @SMPITOOLS_SH@
 
+list_set INCLUDEARGS @includeflag@
+list_set CMAKE_LINKARGS "-L@libdir@"
+
 list_set FFLAGS @SMPI_Fortran_FLAGS@
 list_set LINKARGS "-lsimgrid" @SMPI_Fortran_LIBS@ "-lm"
 if [ "x${SMPI_PRETEND_CC}" = "x" ]; then
@@ -128,7 +128,7 @@ while [ $# -gt 0 ]; do
             TRACE_CALL_LOCATION=1
             # This should be list_add FFLAGS but it's not possible
             # anymore: FFLAGS was already moved into CMDLINE above.
-            list_add_not_empty CMDLINE "-ffixed-line-length-none" "-cpp"
+            list_add CMDLINE "-ffixed-line-length-none" "-cpp"
             ;;
         -o)
             list_add CMDLINE "-o$1"
@@ -149,7 +149,7 @@ if [ $NEEDS_OUTPUT -ne 0 ]; then
    list_add CMDLINE "-o${ORIGFILE}.o"
 fi
 
-list_add_not_empty CMDLINE ${INCLUDEARGS}
+list_add_not_empty CMDLINE "${INCLUDEARGS}"
 list_add_not_empty CMDLINE "${CMAKE_LINKARGS}"
 list_add_not_empty CMDLINE "${LINKARGS}"