From 9c9ac15245ea1584ecc0a6acf2bc04df0646eff9 Mon Sep 17 00:00:00 2001
From: Bob Jamison <ishmalius@gmail.com>
Date: Thu, 13 Mar 2008 18:50:06 +0000
Subject: Make linux JVM search a little smarter, taking Ted's advice for
 IcedTea

(bzr r5084)
---
 src/bind/javabind.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/bind/javabind.cpp')

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
 };
 
-- 
cgit v1.2.3