2 files changed, 4 insertions, 11 deletions
diff --git a/build.bat b/build.bat
index 1d3a44512..c88f8c1b2 100755
--- a/build.bat
+++ b/build.bat
@@ -9,11 +9,11 @@ set LIBDIR=lib
 set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar;%LIBDIR%\jimi-1.0.jar
 set ANT_HOME=%LIBDIR%
 
-echo Building with classpath %LOCALCLASSPATH%;%CLASSPATH%
+echo Building with classpath %LOCALCLASSPATH%
 
 echo Starting Ant...
 
-%JAVA_HOME%\bin\java.exe -Dant.home=%ANT_HOME% -classpath %LOCALCLASSPATH%;%CLASSPATH% org.apache.tools.ant.Main %1 %2 %3 %4 %5
+%JAVA_HOME%\bin\java.exe -Dant.home=%ANT_HOME% -classpath "%LOCALCLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5
 
 goto end
 
diff --git a/build.sh b/build.sh
index 9d561f17e..d53de215c 100755
--- a/build.sh
+++ b/build.sh
@@ -17,15 +17,8 @@ LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.j
 ANT_HOME=$LIBDIR
 
 echo
-CP=$LOCALCLASSPATH
-if [ ! "$CLASSPATH" = "" ]
-then
-CP=$CP:$CLASSPATH
-fi
-echo Building with classpath $CP
-
-
+echo Building with classpath $LOCALCLASSPATH
 echo Starting Ant...
 echo
 
-$JAVA_HOME/bin/java -Dant.home=$ANT_HOME -classpath "$CP" org.apache.tools.ant.Main $*
+$JAVA_HOME/bin/java -Dant.home=$ANT_HOME -classpath "$LOCALCLASSPATH" org.apache.tools.ant.Main $*