diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-10-22 17:57:15 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-10-22 17:57:15 +0200 |
| commit | 6fe9490eac7366d9da691d4129b8d2d23f19a139 (patch) | |
| tree | 46a8cdc9a72a8c414a7824225bd76ec8c241fbdb /classes/native.bbclass | |
| parent | 3836ac00385216dd47d89ec3cebc12e5446feef9 (diff) | |
| parent | ca7e39e27802da8aecf68d74166ec0d2117c8c70 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'classes/native.bbclass')
| -rw-r--r-- | classes/native.bbclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/classes/native.bbclass b/classes/native.bbclass index 8f79935040..61048b6b14 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -80,11 +80,14 @@ export oldincludedir = "${STAGING_DIR_NATIVE}${layout_includedir}" do_stage () { if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ] then - if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" != "1" ] + if [ "${JAVA_NATIVE_STAGE_INSTALL}" = "1" ] + then + java_stage + elif [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" = "1" ] then - oe_runmake install - else autotools_stage_all + else + oe_runmake install fi fi } |