From: ishmal <ishmal@users.sourceforge.net>
Date: Thu, 13 Mar 2008 18:50:06 +0000 (+0000)
Subject: Make linux JVM search a little smarter, taking Ted's advice for IcedTea
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=174c5378d5d2ed0b7ab8fb2562cd1457cae851ab;p=inkscape.git

Make linux JVM search a little smarter, taking Ted's advice for IcedTea
---

diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp
index 1424a527b..b142efd54 100644
--- a/src/bind/javabind.cpp
+++ b/src/bind/javabind.cpp
@@ -473,10 +473,12 @@ static bool findJVMRecursive(const String &dirpath,
 
 static const char *commonJavaPaths[] =
 {
-    "/usr/java",
-    "/usr/local/java",
+    "/usr/lib/jvm/jre",
     "/usr/lib/jvm",
+    "/usr/local/lib/jvm/jre",
     "/usr/local/lib/jvm",
+    "/usr/java",
+    "/usr/local/java",
     NULL
 };