summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBurak Emir <emir@epfl.ch>2008-02-23 12:43:28 +0000
committerBurak Emir <emir@epfl.ch>2008-02-23 12:43:28 +0000
commitdbf12a761a461e95282e37cf8ff548e431c601cb (patch)
treeaaa7b872d4ae948bb3118cd049b847bdaa6abe9e
parentcad235ff621ea56409e6efe78222def4dcf21d08 (diff)
downloadscala-dbf12a761a461e95282e37cf8ff548e431c601cb.tar.gz
scala-dbf12a761a461e95282e37cf8ff548e431c601cb.tar.bz2
scala-dbf12a761a461e95282e37cf8ff548e431c601cb.zip
startup scripts honor an existing SCALA_HOME now.
-rw-r--r--src/compiler/scala/tools/ant/templates/tool-unix.tmpl4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
index d963d18873..da17878fbe 100644
--- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
+++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
@@ -30,7 +30,9 @@ while [ -h "$SOURCE" ]; do
SOURCE=`dirname "$SOURCE"`/${TARGET:-.};
fi;
done;
-SCALA_HOME=`dirname "$SOURCE"`/..;
+if [ "$SCALA_HOME" == "" ] then
+ SCALA_HOME=`dirname "$SOURCE"`/..;
+fi;
SCALA_HOME=`cd "$SCALA_HOME"; pwd`;
if $cygwin; then
SCALA_HOME=`cygpath --windows --short-name "$SCALA_HOME"`