From 7951bb92074d58feef3682e9ee89237b0dc8440f Mon Sep 17 00:00:00 2001
From: Mikko Rantalainen <mikko.rantalainen@peda.net>
Date: Wed, 5 May 2010 16:51:40 +0300
Subject: 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.
---
 infrastructure/bin/makejar.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'infrastructure/bin/makejar.sh')

diff --git a/infrastructure/bin/makejar.sh b/infrastructure/bin/makejar.sh
index feace68..46b4609 100755
--- a/infrastructure/bin/makejar.sh
+++ b/infrastructure/bin/makejar.sh
@@ -32,11 +32,11 @@ fi
 
 TMPSTORE=/tmp/ajbuild-tmpstore-`date +%s`
 
-JARFILES=`echo $SCALA_HOME/scala-library.jar lib/*.jar lib/manifest`
+JARFILES=`echo $SCALA_LIBRARY_JAR lib/*.jar lib/manifest`
 function genjar {
     echo "unzipping JARs..."
     pushd $1 >> /dev/null
-    $JAR xf $SCALA_HOME/scala-library.jar
+    $JAR xf $SCALA_LIBRARY_JAR
     rm -rf META-INF
     for a in ../../lib/*.jar; do
 	$JAR xf $a
-- 
cgit v1.2.3-1-g7c22