From ff46b04fc9c2f68c807cea563b2008e36ff2f260 Mon Sep 17 00:00:00 2001
From: Burak Emir <emir@epfl.ch>
Date: Thu, 9 Mar 2006 16:36:24 +0000
Subject: fixed handling of classpath again, adds "." if ...

fixed handling of classpath again, adds "." if nothing is specified
---
 src/compiler/scala/tools/ant/templates/generic-unix.tmpl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/compiler/scala/tools/ant/templates/generic-unix.tmpl b/src/compiler/scala/tools/ant/templates/generic-unix.tmpl
index c8ec80cee2..b33f1e697b 100644
--- a/src/compiler/scala/tools/ant/templates/generic-unix.tmpl
+++ b/src/compiler/scala/tools/ant/templates/generic-unix.tmpl
@@ -46,7 +46,7 @@ if [ "$MYCLASSPATH" == "" ] ; then
   done
 fi
 
-QQ_USERCLASSPATH=""
+QQ_USERCLASSPATH="."
 QQ_USERARGS=""
 QQ_NEXT=0
 for i in $@@
@@ -55,7 +55,7 @@ do
   then
     QQ_USERCLASSPATH=$i;
     QQ_NEXT=0
-  else if [ $i = "-cp" ]
+  else if [ $i = "-cp" || $i = "-classpath" ]
        then
         QQ_NEXT=1
        else
@@ -84,12 +84,14 @@ fi
 ## Lex suggested the userclasspath come before our stuff, since it gets
 ## preferred.
 
-if [ "$QQ_USERCLASSPATH" != "" ]
+if [ "$QQ_USERCLASSPATH" != "." ]
 then
   MYCLASSPATH="$QQ_USERCLASSPATH:$MYCLASSPATH"
 else if [ "$CLASSPATH" != "" ]
   then
   MYCLASSPATH="$CLASSPATH:$MYCLASSPATH"
+  else
+  MYCLASSPATH=".:$MYCLASSPATH"
   fi
 fi
 
-- 
cgit v1.2.3