|
@@ -162,8 +162,8 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
|
|
|
/usr/lib/jvm/java-6-sun/jre/lib/{libarch}
|
|
|
/usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
|
|
|
/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed according to #8821 ? Alex
|
|
|
- /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 12.10 location
|
|
|
/usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 13.04 location
|
|
|
+ /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 12.10 location
|
|
|
/usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
|
|
|
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch} # fedora
|
|
|
# Debian specific paths for default JVM
|
|
@@ -193,8 +193,8 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_EXPANDED_INCLUDE_DIRECTORIES
|
|
|
/usr/lib/jvm/java-6-sun/include
|
|
|
/usr/lib/jvm/java-1.5.0-sun/include
|
|
|
/usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex
|
|
|
- /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 12.10 location
|
|
|
/usr/lib/jvm/java-7-openjdk-{libarch}/include # Ubuntu 13.04 location
|
|
|
+ /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 12.10 location
|
|
|
/usr/lib/jvm/java-6-openjdk/include
|
|
|
/usr/local/share/java/include
|
|
|
/usr/lib/j2sdk1.4-sun/include
|
|
@@ -313,4 +313,4 @@ SET(JNI_INCLUDE_DIRS
|
|
|
${JAVA_INCLUDE_PATH}
|
|
|
${JAVA_INCLUDE_PATH2}
|
|
|
${JAVA_AWT_INCLUDE_PATH}
|
|
|
-)
|
|
|
+)
|