VM jar names are vendor specific

releng.control/ant.sh

@@ -11,16 +11,16 @@ LD_LIBRARY_PATH=/opt/gnome/lib:/opt/gnome/lib64
 export LD_LIBRARY_PATH
 
 
-CCDIR=$BUILD_HOME/apps/cruisecontrol-bin-2.5
+CCDIR=${BUILD_HOME}/apps/cruisecontrol-bin-2.5
 export CCDIR
 
 JAVA_HOME=${BUILD_HOME}/apps/${JAVA_4_DIR}
 export JAVA_HOME
 
-JAVA5_HOME=$BUILD_HOME/apps/${JAVA_5_DIR}
+JAVA5_HOME=${BUILD_HOME}/apps/${JAVA_5_DIR}
 export JAVA5_HOME
 
-ANT_HOME=$BUILD_HOME/apps/apache-ant-1.6.5
+ANT_HOME=${BUILD_HOME}/apps/apache-ant-1.6.5
 export ANT_HOME
 
 

releng.control/commonVariations.sh

@@ -17,11 +17,11 @@ export JAVA_5_DIR="ibm-java2-ppc-50"
 # on the PPC machine, so we'll leave that as the defaults 
 # in this file. 
 
-#export bootclasspath="${JAVA_HOME}/jre/lib/rt.jar:$JAVA_HOME/jre/lib/jsse.jar"
+#export bootclasspath="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar"
 #export bootclasspath_15="${JAVA5_HOME}/jre/lib/rt.jar"
 
-export bootclasspath="${JAVA_HOME}/jre/lib/core.jar:$JAVA_HOME/jre/lib/ibmjsseprovider.jar:$JAVA_HOME/jre/lib/xml.jar"
-export bootclasspath_15="${JAVA5_HOME}/jre/lib/core.jar:$JAVA5_HOME/jre/lib/vm.jar:$JAVA_HOME/jre/lib/xml.jar"
+export bootclasspath="${JAVA_HOME}/jre/lib/core.jar:${JAVA_HOME}/jre/lib/ibmjsseprovider.jar:${JAVA_HOME}/jre/lib/xml.jar"
+export bootclasspath_15="${JAVA5_HOME}/jre/lib/core.jar:${JAVA5_HOME}/jre/lib/vm.jar:${JAVA5_HOME}/jre/lib/xml.jar"
 
 export BUILD_INITIALIZED="true"