summaryrefslogtreecommitdiff
path: root/application.rb
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2012-09-28 12:55:27 +0200
committerAndreas Maunz <andreas@maunz.de>2012-09-28 12:55:27 +0200
commitc3563cb82bfa7fd8047d901c33bd959a89bb7d59 (patch)
tree1de9e1ef66191631bfe9cb826a18c6a9f3a26809 /application.rb
parent339dab8df535b4e23c476382fe48b11752882600 (diff)
parent1e68543d97e4f21b359cee0c8c591f77db43dfef (diff)
Merge branch 'master' into cmpdfixcmpdfix
Diffstat (limited to 'application.rb')
-rw-r--r--application.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/application.rb b/application.rb
index 4908917..a4dcfab 100644
--- a/application.rb
+++ b/application.rb
@@ -1,11 +1,11 @@
# Java Klimbim
ENV["JAVA_HOME"] = "/usr/lib/jvm/java-6-sun" unless ENV["JAVA_HOME"]
-ENV["JOELIB2"] = File.join File.expand_path(File.dirname(__FILE__)),"java"
+ENV["JAVA_CP"] = File.join File.expand_path(File.dirname(__FILE__)),"java"
deps = []
deps << "#{ENV["JAVA_HOME"]}/lib/tools.jar"
deps << "#{ENV["JAVA_HOME"]}/lib/classes.jar"
-deps << "#{ENV["JOELIB2"]}"
-jars = Dir[ENV["JOELIB2"]+"/*.jar"].collect {|f| File.expand_path(f) }
+deps << "#{ENV["JAVA_CP"]}"
+jars = Dir[ENV["JAVA_CP"]+"/*.jar"].collect {|f| File.expand_path(f) }
deps = deps + jars
ENV["CLASSPATH"] = deps.join(":")