diff options
| author | Martin Odersky <odersky@gmail.com> | 2008-02-24 10:28:01 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2008-02-24 10:28:01 +0000 |
| commit | 0053d374d69c764625adaed38b81b5c5b0372b2c (patch) | |
| tree | ba70451ee08008bcfc0868a4b96efb15c7d3792f | |
| parent | 12a0200eae15615cf81caa3be8febda00c968919 (diff) | |
| download | scala-0053d374d69c764625adaed38b81b5c5b0372b2c.tar.gz scala-0053d374d69c764625adaed38b81b5c5b0372b2c.tar.bz2 scala-0053d374d69c764625adaed38b81b5c5b0372b2c.zip | |
reverted Burak's change which broke every singl...
reverted Burak's change which broke every single test
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl index da17878fbe..d963d18873 100644 --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl @@ -30,9 +30,7 @@ while [ -h "$SOURCE" ]; do SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; fi; done; -if [ "$SCALA_HOME" == "" ] then - SCALA_HOME=`dirname "$SOURCE"`/..; -fi; +SCALA_HOME=`dirname "$SOURCE"`/..; SCALA_HOME=`cd "$SCALA_HOME"; pwd`; if $cygwin; then SCALA_HOME=`cygpath --windows --short-name "$SCALA_HOME"` |