prep for creating a patch feature
diff --git a/releng.control/cc.sh b/releng.control/cc.sh
index 9f7a21c..c0265e9 100644
--- a/releng.control/cc.sh
+++ b/releng.control/cc.sh
@@ -1,20 +1,23 @@
#!/bin/sh
+# remember to leave no slashes on filename in source command,
+# so that users path is used to find it (first)
+if [ -n $BUILD_INITIALIZED]
+then
+ source commonVariations.sh
+fi
+
LD_LIBRARY_PATH=/opt/gnome/lib:/opt/gnome/lib64
export LD_LIBRARY_PATH
-
-
-BUILD_HOME=/shared/webtools
-export BUILD_HOME
-
CCDIR=${BUILD_HOME}/apps/cruisecontrol-bin-2.5
export CCDIR
# NOTE: we intentionally use Java 5 here to run Cruise Control
-JAVA_HOME=${BUILD_HOME}/apps/ibm-java2-ppc-50
+JAVA_HOME=${BUILD_HOME}/apps/${JAVA_5_DIR}
export JAVA_HOME
-JAVA5_HOME=${BUILD_HOME}/apps/ibm-java2-ppc-50
+
+JAVA5_HOME=$BUILD_HOME/apps/${JAVA_5_DIR}
export JAVA5_HOME
ANT_HOME=${BUILD_HOME}/apps/apache-ant-1.6.5
@@ -22,9 +25,6 @@
port="7000"
-DISPLAY=127.0.0.1:1.0
-export DISPLAY
-
rm -fr ./workspace
PATH=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/games:/opt/gnome/bin:/opt/kde3/bin