1 files changed, 7 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
index 081b0219da..2dd8c1f7c4 100644
--- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
+++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
@@ -32,12 +32,12 @@ PREFIX=`dirname "$SOURCE"`/..;
 prefix=$PREFIX;
 PREFIX=`cd "$PREFIX"; pwd`;
 
-CP=@classpath@
-if [ "$CP" == "" ] ; then
+CLASSPATH=@classpath@
+if [ "$CLASSPATH" == "" ] ; then
   for jar in `ls $PREFIX/lib/*.jar` ; do
-    CP=$CP:$jar
+    CLASSPATH=$CLASSPATH:$jar
   done
-  CP=${CP:1}
+  CLASSPATH=${CLASSPATH:1}
 fi
 
 if $cygwin; then
@@ -46,14 +46,14 @@ if $cygwin; then
     else
         format=windows
     fi
-    CP=`cygpath --path --$format "$CP"`
+    CLASSPATH=`cygpath --path --$format "$CLASSPATH"`
 fi
 
 for flag in "$@@" ; do
     if [ $flag == '-version' ] ; then
-        echo "@name@ version @version@"
+        echo "@name@ version @version@ -- @copyright@"
         exit 0
     fi
 done
 
-${JAVACMD:=java} @javaflags@ -Dscala.home="$PREFIX" -Dscala.tool.name="@name@" -Dscala.tool.version="@version@" @properties@ -cp "$CP" @class@ @toolflags@ "$@@"
-\ No newline at end of file
+${JAVACMD:=java} @javaflags@ -Dscala.home="$PREFIX" -Dscala.tool.name="@name@" -Dscala.tool.version="@version@" @properties@ -cp "$CLASSPATH" @class@ @toolflags@ "$@@"
+\ No newline at end of file