properly setup java path for ant script

bin/dm-ant

@@ -13,8 +13,8 @@ if [ -z $DM_ROOT_DIR ]; then
 fi
 
 DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
-export JAVA_HOME=$DM_SUPPORT/java/$DM_HOST_ARCH
-export ANT_HOME=$DM_SUPPORT/ant
+export JAVA_HOME=$DM_SUPPORT_DIR/java/$DM_HOST_ARCH
+export ANT_HOME=$DM_SUPPORT_DIR/ant
 export PATH=$ANT_HOME/bin:$PATH
 ant $@
 

setup.sh

@@ -53,8 +53,10 @@ prependPathIfDirExists() {
 }
 
 # Setup path and other variables
-PATH=$DM_SUPPORT_DIR/postgresql/$DM_HOST_ARCH/bin:$PATH
-PATH=$DM_ROOT_DIR/bin:$PATH
+prependPathIfDirExists $DM_SUPPORT_DIR/postgresql/$DM_HOST_ARCH/bin
+prependPathIfDirExists $DM_SUPPORT_DIR/java/$DM_HOST_ARCH/bin
+prependPathIfDirExists $DM_SUPPORT_DIR/ant/bin
+prependPathIfDirExists $DM_ROOT_DIR/bin
 PATH=.:$PATH
 export PATH
 
@@ -65,9 +67,8 @@ else
 fi
 export LD_LIBRARY_PATH
 
-# Setup python path. First check for wx, then try to  find it locally, and 
-# then re-check for it.
-# Check if we have  local python
+# Setup python path. 
+# Check if we have local python
 if [ -z $DM_PYTHON_DIR ]; then
     pythonDir=$DM_SUPPORT_DIR/python/$DM_HOST_ARCH
 else

src/Makefile

 
-TOP = ../..
-SUBDIRS = DmWebPortal
+TOP = ..
+SUBDIRS = java
 
 include $(TOP)/tools/make/RULES_DM