COMP: change ordering of statements to prevent premature termination after make

COMP: VTK- prefix not being trimmed from the name

etc/tools/vtkFunctions

@@ -169,11 +169,12 @@ makeVTK()
     cd $VTK_BUILD_DIR || exit 1  # Change to build folder
     echo "    Starting make"
     time make -j $WM_NCOMPPROCS
-    echo "    Done make"
 
     # Remove lib if it is a link
     # (how this was previously handled before 'make install' worked)
     [ -L lib ] && rm -f lib 2>/dev/null
+
+    echo "    Done make"         # Last statement for clean return code
 }
 
 

makeVTK

@@ -54,7 +54,7 @@ unset vtk_version mesa_version                           # Purge current values
 # vtk version from OpenFOAM etc/config.sh file:
 _foamEtc config.sh/vtk
 
-VTK_VERSION=$vtk_version
+VTK_VERSION="${vtk_version##*-}"               # Without prefix
 
 # New rendering backend (starting with vtk 7?).
 withGL2=auto # auto-config based on version