diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-06-27 16:05:50 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-06-27 16:05:50 +0000 |
| commit | 882473c9913cf09da1f8e89738cb859e1e8bd882 (patch) | |
| tree | 818e039de162dcbc73f7826c28687132055dc561 /classes | |
| parent | 31c3d2f534c933df59abd3f594d177b781e549ba (diff) | |
| parent | f3b6b70f150b257afef3d025c1ed86b9270966b3 (diff) | |
merge of '28c74aa25680384c6f311fd8f4123ddb27c1ba65'
and '77f81ea18669b5c79145faa5f0a96df1d7db3232'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/cross.bbclass | 4 | ||||
| -rw-r--r-- | classes/java.bbclass | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/classes/cross.bbclass b/classes/cross.bbclass index 89cb3e9569..a35f4dfb79 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -49,8 +49,8 @@ bindir = "${exec_prefix}/bin" sbindir = "${exec_prefix}/bin" libexecdir = "${exec_prefix}/libexec" libdir = "${exec_prefix}/lib" -includedir = "${exec_prefix}/include" -oldincludedir = "${exec_prefix}/include" +includedir = "${STAGING_DIR_TARGET}/${layout_includedir}" +oldincludedir = "${STAGING_DIR_TARGET}/${layout_includedir}" do_stage () { oe_runmake install diff --git a/classes/java.bbclass b/classes/java.bbclass index e51b0d71da..17f833ce3d 100644 --- 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. |