Index: vectorcast/setup_env.sh
===================================================================
diff -u -rc403f891689e120d6202a3f3fab85ac1054f8f45 -rf0c69714f9b6a7d637ef488588e0965eb5588b7b
--- vectorcast/setup_env.sh	(.../setup_env.sh)	(revision c403f891689e120d6202a3f3fab85ac1054f8f45)
+++ vectorcast/setup_env.sh	(.../setup_env.sh)	(revision f0c69714f9b6a7d637ef488588e0965eb5588b7b)
@@ -5,15 +5,25 @@
 # *** Insert any custom environment variables needed ***
 
 # *******************************************************
+doesDialityDirExist=false
 
+# Check if this script is called from a Diality machine by checking the location that VectorCAST has been installed
+if [[ -d /opt/VectorCASTSP3 ]]; then
+   doesDialityDirExist=true 
+fi
+
 # VECTORCAST_DIR - Environment variable pointing to the base directory for VectorCAST
-if [ -z "$VECTORCAST_DIR" ]; then
-    export VECTORCAST_DIR=/usr/local/vcast/vcast1
+if [ "$doesDialityDirExist" == false ]; then
+    export VECTORCAST_DIR=/usr/local/vcast/
+else
+   export VECTORCAST_DIR=~/vcast
 fi
 
 # VECTOR_LICENSE_FILE - Environment variable pointing to the license file
-if [ -z "$VECTOR_LICENSE_FILE" ]; then
+if [ "$doesDialityDirExist" == false ]; then
     export VECTOR_LICENSE_FILE=/usr/local/flexlm/licenses/license.dat
+else
+    export VECTOR_LICENSE_FILE=27000@dvm-util01
 fi
 
 # VCAST_COMPILER_DIR - Environment variable pointing to the base directory of compiler installation