Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 49615 invoked from network); 27 Feb 2004 15:40:37 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 27 Feb 2004 15:40:37 -0000 Received: (qmail 82206 invoked by uid 500); 27 Feb 2004 15:40:30 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 82166 invoked by uid 500); 27 Feb 2004 15:40:29 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 82151 invoked by uid 500); 27 Feb 2004 15:40:29 -0000 Received: (qmail 82147 invoked from network); 27 Feb 2004 15:40:29 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 27 Feb 2004 15:40:29 -0000 Received: (qmail 49583 invoked by uid 1146); 27 Feb 2004 15:40:34 -0000 Date: 27 Feb 2004 15:40:34 -0000 Message-ID: <20040227154034.49582.qmail@minotaur.apache.org> From: bodewig@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/src/script ant X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N bodewig 2004/02/27 07:40:34 Modified: src/script ant Log: More tweaks to the RPM specific section, submitted by Randy Watler Revision Changes Path 1.46 +8 -6 ant/src/script/ant Index: ant =================================================================== RCS file: /home/cvs/ant/src/script/ant,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- ant 11 Feb 2004 08:29:38 -0000 1.45 +++ ant 27 Feb 2004 15:40:34 -0000 1.46 @@ -182,12 +182,14 @@ # # if CLASSPATH_OVERRIDE is not set, we'll have the normal behaviour # with ant-found jars first and user CLASSPATH after - if [ -n "$CLASSPATH" -a -n "$CLASSPATH_OVERRIDE" ] ; then - # prepend local class path with class path override - if [ -z "$LOCALCLASSPATH" ] ; then - LOCALCLASSPATH="$CLASSPATH" - else - LOCALCLASSPATH="$CLASSPATH:$LOCALCLASSPATH" + if [ -n "$CLASSPATH" ] ; then + # merge local and specified classpath + if [ -z "$LOCALCLASSPATH" ] ; then + LOCALCLASSPATH="$CLASSPATH" + elif [ -n "$CLASSPATH_OVERRIDE" ] ; then + LOCALCLASSPATH="$CLASSPATH:$LOCALCLASSPATH" + else + LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH" fi # remove class path from launcher -lib option --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org