merge of 'ba2394dc8bed77043b229f3e5c42b4b69aeca918'

     and 'e8b3409511829c8c35d2859b5756d0206fbb3016'

diff --git a/classes/java.bbclass b/classes/java.bbclass
index e51b0d7..17f833c 100644 (file)
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -1,5 +1,8 @@
 # Defines the commonly used target directories and provides a convenience
 # function to install jar files.
+#
+# All the default directory locations herein resemble locations chosen in
+# the Debian distribution.
 
 # Jar location on target
 datadir_java ?= ${datadir}/java
@@ -7,8 +10,12 @@ datadir_java ?= ${datadir}/java
 # JNI library location on target
 libdir_jni ?= ${libdir}/jni
 
+# JVM bundle location on target
+libdir_jvm ?= ${libdir}/jvm
+
 STAGING_DATADIR_JAVA ?= ${STAGING_DATADIR}/java
 STAGING_LIBDIR_JNI ?= ${STAGING_LIBDIR}/jni
+STAGING_LIBDIR_JVM ?= ${STAGING_LIBDIR}/jvm
 
 oe_jarinstall() {
   # Purpose: Install a jar file and create all the given symlinks to it.