77b99cc145
Changelog: * Bug fixes. * New features. See http://www.scala-lang.org/2.10.2 etc in detail.
24 lines
706 B
Text
24 lines
706 B
Text
$NetBSD: patch-bin_scalap,v 1.2 2013/07/05 14:40:33 ryoon Exp $
|
|
|
|
Hardwire paths to installed files and Java binary.
|
|
|
|
--- bin/scalap.orig 2013-07-05 14:33:17.000000000 +0000
|
|
+++ bin/scalap
|
|
@@ -68,7 +68,7 @@ if uname | grep -q ^MINGW; then
|
|
fi
|
|
|
|
# Finding the root folder for this Scala distribution
|
|
-SCALA_HOME="$(findScalaHome)"
|
|
+SCALA_HOME="@SCALA_HOME@"
|
|
SEP=":"
|
|
|
|
# Possible additional command line options
|
|
@@ -192,7 +192,7 @@ fi
|
|
# be quoted: otherwise an empty string will appear as a command line
|
|
# argument, and java will think that is the program to run.
|
|
execCommand \
|
|
- "${JAVACMD:=java}" \
|
|
+ "${JAVACMD:=@JAVA_HOME@/bin/java}" \
|
|
$JAVA_OPTS \
|
|
"${java_args[@]}" \
|
|
$(classpathArgs) \
|