diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-07-01 10:57:19 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-07-01 10:57:19 +0000 |
| commit | 7ac2fc34f7fabf846b4d5ebecf26eb63d123ab4b (patch) | |
| tree | b2145dae1624949588a458835df7a37ec01a7159 /src/compiler/scala/tools/ant/templates/tool-unix.tmpl | |
| parent | d17c979ce0259c8eb2ad678e63f1eb28f46737a6 (diff) | |
| download | scala-7ac2fc34f7fabf846b4d5ebecf26eb63d123ab4b.tar.gz scala-7ac2fc34f7fabf846b4d5ebecf26eb63d123ab4b.tar.bz2 scala-7ac2fc34f7fabf846b4d5ebecf26eb63d123ab4b.zip | |
Fix for #2092
Diffstat (limited to 'src/compiler/scala/tools/ant/templates/tool-unix.tmpl')
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl index 936767bc3b..2a7c650b9a 100644 --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl @@ -26,8 +26,12 @@ while [ -h "$SOURCE" ]; do SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; fi; done; -SCALA_HOME=`dirname "$SOURCE"`/..; -SCALA_HOME=`cd "$SCALA_HOME"; pwd`; + +# see #2092 +SCALA_HOME=`dirname "$SOURCE"` +SCALA_HOME=`cd "$SCALA_HOME"; pwd -P` +SCALA_HOME=`cd "$SCALA_HOME"/..; pwd` + # Remove spaces from SCALA_HOME on windows if $cygwin; then SCALA_HOME=`cygpath --windows --short-name "$SCALA_HOME"` |