aboutsummaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMikko Rantalainen <mikko.rantalainen@peda.net>2010-05-05 16:51:40 +0300
committerMikko Rantalainen <mikko.rantalainen@peda.net>2010-05-06 11:30:22 +0300
commit7951bb92074d58feef3682e9ee89237b0dc8440f (patch)
tree72ec1eb45ea3ce52707d664e798eb1ad7f672b70 /bin
parenteae8518d5db31cc70856cf9845c6974caee04bf3 (diff)
downloadetherpad-7951bb92074d58feef3682e9ee89237b0dc8440f.tar.gz
etherpad-7951bb92074d58feef3682e9ee89237b0dc8440f.tar.xz
etherpad-7951bb92074d58feef3682e9ee89237b0dc8440f.zip
Make scala library JAR location configurable
scala-library.jar may be in $SCALA_HOME/lib or in $SCALA_HOME. Make it possible to point directly to scala-library.jar anywhere.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/build.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/build.sh b/bin/build.sh
index 3e42c96..7aa70e3 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -25,8 +25,9 @@
# You have to change following lines to your requirements:
#
export JAVA_HOME="/usr/lib/jvm/java-6-sun/"
-export SCALA_HOME=/usr/share/java
-export MYSQL_CONNECTOR_JAR=/usr/share/java/mysql-connector-java.jar
+export SCALA_HOME="/usr/share/java"
+export SCALA_LIBRARY_JAR="/usr/share/java/scala-library.jar"
+export MYSQL_CONNECTOR_JAR="/usr/share/java/mysql-connector-java.jar"
export JAVA="/usr/lib/jvm/java-6-sun/bin/java"
export SCALA="/usr/bin/scala"
export PATH="/usr/lib/jvm/java-6-sun/bin:$PATH"