Problems with the .bat files on Win98.

Submitted by:	Glenn McAllister <glennm@ca.ibm.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267965 13f79535-47bb-0310-9956-ffa450edef68

build.bat

@@ -6,11 +6,16 @@ if exist lib\ant.jar if exist bin\ant.bat if exist bin\lcp.bat if exist bin\antR
 call bootstrap.bat
 
 :runAnt
-set ANT_INSTALL=
-if not "%REALANTHOME%" == "" set ANT_INSTALL=-Dant.install %REALANTHOME%
-call .\bin\ant.bat %ANT_INSTALL% %1 %2 %3 %4 %5 %6 %7 %8 %9
+if not "%REALANTHOME%" == "" goto install_ant
+call .\bin\ant.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+goto cleanup
+
+:install_ant
+set ANT_INSTALL="-Dant.install%REALANTHOME%"
+call .\bin\ant.bat -Dant.install=%REALANTHOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 rem clean up
+:cleanup
 set ANT_HOME=%REALANTHOME%
 set REALANTHOME=
 set ANT_INSTALL=

src/bin/ant.bat

@@ -37,11 +37,14 @@ echo   to the installation directory of java.
 echo.
 
 :checkJikes
-set ANT_OPTS_RUN=%ANT_OPTS%
-if not "%JIKESPATH%" == "" set ANT_OPTS_RUN=%ANT_OPTS% -Djikes.class.path=%JIKESPATH%
+if not "%JIKESPATH%" == "" goto runAntWithJikes
 
 :runAnt
-%JAVACMD% -classpath "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS_RUN% org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
+%JAVACMD% -classpath "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
+goto end
+
+:runAntWithJikes
+%JAVACMD% -classpath "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" -Djikes.class.path=%JIKESPATH% %ANT_OPTS% org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 :end
 set LOCALCLASSPATH=