diff options
| -rw-r--r-- | classes/java.bbclass | 2 | ||||
| -rw-r--r-- | conf/bitbake.conf | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/classes/java.bbclass b/classes/java.bbclass index b68035c13e..d4cf5aa954 100644 --- a/classes/java.bbclass +++ b/classes/java.bbclass @@ -13,7 +13,7 @@ libdir_jni ?= ${libdir}/jni # JVM bundle location on target libdir_jvm ?= ${libdir}/jvm -STAGING_DATADIR_JAVA ?= ${STAGING_DATADIR}/java +STAGING_DATADIR_JAVA ?= ${STAGING_DIR_JAVA} STAGING_LIBDIR_JNI ?= ${STAGING_LIBDIR}/jni STAGING_LIBDIR_JVM ?= ${STAGING_LIBDIR}/jvm diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 48e098db44..3a68959c6c 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -297,6 +297,7 @@ B = "${S}" STAGING_DIR = "${TMPDIR}/staging" +STAGING_DIR_JAVA = "${STAGING_DIR}/java" STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}" |