bitbake.conf: Redefine STAGING_DIR_JAVA to point to target sysroot by default

Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 677c76a..b099499 100644 (file)
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -295,7 +295,6 @@ B = "${S}"
 
 STAGING_DIR = "${TMPDIR}/sysroots"
 
-STAGING_DIR_JAVA = "${STAGING_DIR}/java"
 STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
 STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
 STAGING_SBINDIR_NATIVE = "${STAGING_DIR_NATIVE}${sbindir_native}"
@@ -321,6 +320,7 @@ STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
 # This should really be MULTIMACH_TARGET_SYS but that breaks "all" and machine 
 # specific packages - hack around it for now.
 STAGING_DIR_TARGET = "${STAGING_DIR}/${BASEPKG_TARGET_SYS}"
+STAGING_DIR_JAVA = "${STAGING_DATADIR}/java"
 
 STAGING_DIR_SDK = "${STAGING_DIR}/${SDK_SYS}"