streamline build scripts
diff --git a/releng.control/ant.sh b/releng.control/ant.sh
index d7f1e46..4172dda 100644
--- a/releng.control/ant.sh
+++ b/releng.control/ant.sh
@@ -7,16 +7,13 @@
if [ -n $BUILD_INITIALIZED ]
then
- source commonVariations.shsource
- source ${BUILD_HOME}/releng.control/commonComputedVariables.shsource
+ pushd .
+ cd ${RELENG_CONTROL}
+ source commonVariations.shsource
+ source ${RELENG_CONTROL}/commonComputedVariables.shsource
+ popd
fi
-# For most ant tasks, we want Java 4 to be default,
-# so if not desired (such as for WTP 2.0 unit tests),
-# then we have to spec Java 5 right there where we run
-# the tests.
-export JAVA_HOME=${JAVA_4_HOME}
-
ANT_CMD=${ANT_HOME}/bin/ant