setup host arch

setup.sh

@@ -9,6 +9,7 @@ if [ ! -z "$DM_ROOT_DIR" -a "$DM_ROOT_DIR" != `pwd` ]; then
     echo "WARNING: Resetting DM_ROOT_DIR environment variable (old value: $DM_ROOT_DIR)" 
 fi
 export DM_ROOT_DIR=`pwd`
+export DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
 
 if [ -z $DM_DATA_DIR ]; then
     export DM_DATA_DIR=$DM_ROOT_DIR/../data
@@ -40,13 +41,12 @@ if [ -z $DM_SUPPORT_DIR ]; then
 fi
 if [ ! -d $DM_SUPPORT_DIR ]; then
     echo "ERROR: $DM_SUPPORT_DIR directory does not exist. Developers should point DM_SUPPORT_DIR to the desired area." 
-    unset DM_SUPPORT
+    unset DM_SUPPORT_DIR
     return 1
 else
     export DM_GLASSFISH_DIR=$DM_SUPPORT_DIR/glassfish/$DM_HOST_ARCH
 fi
 
-export DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
 
 # Add to path only if directory exists.
 prependPathIfDirExists() {