summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBob Jamison <ishmalius@gmail.com>2008-03-13 18:50:06 +0000
committerishmal <ishmal@users.sourceforge.net>2008-03-13 18:50:06 +0000
commit9c9ac15245ea1584ecc0a6acf2bc04df0646eff9 (patch)
treef5d8a616f5acfd3d5c00c5b6df1fdabf582f3d41 /src
parentcalligraphic presets (diff)
downloadinkscape-9c9ac15245ea1584ecc0a6acf2bc04df0646eff9.tar.gz
inkscape-9c9ac15245ea1584ecc0a6acf2bc04df0646eff9.zip
Make linux JVM search a little smarter, taking Ted's advice for IcedTea
(bzr r5084)
Diffstat (limited to 'src')
-rw-r--r--src/bind/javabind.cpp6
1 files changed, 4 insertions, 2 deletions
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
};