diff --git a/utils/nightly/gmsh.ctest b/utils/nightly/gmsh.ctest
index dc5fe17904fc4114b5f22298dde937daa4851d1f..7901c78ee6caf8ea44fc14cbb80e8fac47935e4a 100644
--- a/utils/nightly/gmsh.ctest
+++ b/utils/nightly/gmsh.ctest
@@ -87,12 +87,11 @@ macro(upload_package WEB ARCH EXTRA EXT1 EXT2)
     message("Build reported $ENV{GMSH_BUILD_ERRORS} errors: skipping upload")
     set(ENV{GMSH_BUILD_ERRORS} 0)
   else($ENV{GMSH_BUILD_ERRORS} GREATER 0)
-    message("Build succeeded: uploading package to web site")
     file(GLOB FILE ${CTEST_BINARY_DIRECTORY}/gmsh-*${EXT1})
     if(FILE)
+      get_filename_component(BASENAME ${FILE} NAME)
       if(APPLE) # re-sign package on ace36 (MacOSX 10.7 is too old to produce v2 sigs)
         message("Re-signing MacOS build on ace36")
-        get_filename_component(BASENAME ${FILE} NAME)
         execute_process(COMMAND scp -C ${FILE} ace@ace36.montefiore.ulg.ac.be:/tmp
                         TIMEOUT 60)
         execute_process(COMMAND ssh ace@ace36.montefiore.ulg.ac.be /Users/ace/re-sign.sh /tmp/${BASENAME}
@@ -101,15 +100,16 @@ macro(upload_package WEB ARCH EXTRA EXT1 EXT2)
                         TIMEOUT 60)
         message("Done re-signing MacOS build on ace36")
       endif(APPLE)
+      message("Build succeeded: uploading package ${BASENAME} to web site")
       if(${FILE} MATCHES "-svn")
         execute_process(COMMAND scp -C ${FILE} ${WEB}/gmsh-svn-${ARCH}${EXTRA}${EXT2}
                         TIMEOUT 60)
       else(${FILE} MATCHES "-svn")
-        get_filename_component(NAME ${FILE} NAME)
-        string(REPLACE ${EXT1} "" BASE ${NAME})
+        string(REPLACE ${EXT1} "" BASE ${BASENAME})
         execute_process(COMMAND scp -C ${FILE} ${WEB}/${BASE}${EXTRA}${EXT2}
                         TIMEOUT 60)
       endif(${FILE} MATCHES "-svn")
+      message("Done uploading package to web site")
     endif(FILE)
   endif($ENV{GMSH_BUILD_ERRORS} GREATER 0)
 endmacro(upload_package)