From a7988a63f686fa0249f1ccac7d66f461d182f455 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 8 Sep 2000 15:40:38 +0000
Subject: [PATCH] Change the order parts are added to the CLASSPATH in
 bootstrap scripts. PR: Bug 24, Bug Report 75 Submitted by:	Mason J Warner
 <mjw@novanews.com>

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267976 13f79535-47bb-0310-9956-ffa450edef68
---
 bootstrap.bat | 2 +-
 bootstrap.sh  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bootstrap.bat b/bootstrap.bat
index 9b6758d33..4118a8617 100755
--- a/bootstrap.bat
+++ b/bootstrap.bat
@@ -29,7 +29,7 @@ if exist %JAVA_HOME%\lib\classes.zip call src\bin\lcp.bat %JAVA_HOME%\lib\classe
 set TOOLS=src\main\org\apache\tools
 set CLASSDIR=classes
 
-SET CLASSPATH=%CLASSPATH%;%LOCALCLASSPATH%;%CLASSDIR%;src\main
+SET CLASSPATH=%LOCALCLASSPATH%;%CLASSDIR%;src\main;%CLASSPATH%
 
 echo JAVA_HOME=%JAVA_HOME%
 echo JAVA=%JAVA%
diff --git a/bootstrap.sh b/bootstrap.sh
index 2b7ac80b6..261e7f059 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -14,7 +14,7 @@ fi
 LOCALCLASSPATH=`echo $ANT_HOME/lib/*.jar | tr ' ' ':'`
 
 if [ "$CLASSPATH" != "" ] ; then
-  CLASSPATH=$CLASSPATH:$LOCALCLASSPATH
+  CLASSPATH=$LOCALCLASSPATH:$CLASSPATH
 else
   CLASSPATH=$LOCALCLASSPATH
 fi
@@ -37,7 +37,7 @@ fi
 TOOLS=src/main/org/apache/tools
 CLASSDIR=classes
 
-CLASSPATH=${CLASSPATH}:${CLASSDIR}:src/main
+CLASSPATH=${CLASSDIR}:src/main:${CLASSPATH}
 export CLASSPATH
 
 mkdir -p ${CLASSDIR}