diff options
| author |   Michael Lauer <mickey@vanille-media.de> | 2005-08-09 22:40:46 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-09 22:40:46 +0000 |
| commit | cc66d34e4a411ce7e105df2ecb3d95265157f267 (patch) | |
| tree | b18e2d1bb8174fa6192339cf343ea90350e0b38c /classes | |
| parent | 25dadfa89ec600d7e78598006215a7e7cac12655 (diff) | |
| download | openembedded-cc66d34e4a411ce7e105df2ecb3d95265157f267.tar.gz | |
autotools.bbclass: add INHIBIT_AUTO_STAGE_INCLUDES
native.bbclass: add INHIBIT_NATIVE_STAGE_INSTALL
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools.bbclass | 13 | ||||
| -rw-r--r-- | classes/native.bbclass | 7 |
2 files changed, 13 insertions, 7 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 1d6a607559..8a387da5ca 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -140,11 +140,14 @@ autotools_do_install() { STAGE_TEMP="${WORKDIR}/temp-staging" autotools_stage_includes() { - rm -rf ${STAGE_TEMP} - mkdir -p ${STAGE_TEMP} - make DESTDIR="${STAGE_TEMP}" install - cp -a ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} - rm -rf ${STAGE_TEMP} + if [ "${INHIBIT_AUTO_STAGE_INCLUDES}" != "1" ] + then + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + make DESTDIR="${STAGE_TEMP}" install + cp -a ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} + rm -rf ${STAGE_TEMP} + fi } EXPORT_FUNCTIONS do_configure do_install diff --git a/classes/native.bbclass b/classes/native.bbclass index 3391694838..955a8ae646 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -50,14 +50,17 @@ libdir = "${exec_prefix}/lib" includedir = "${exec_prefix}/include" oldincludedir = "${exec_prefix}/include" -# Datadir is made arch depenedent here, primarily +# Datadir is made arch dependent here, primarily # for autoconf macros, and other things that # may be manipulated to handle crosscompilation # issues. datadir = "${exec_prefix}/share" do_stage () { - oe_runmake install + if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ] + then + oe_runmake install + fi } do_install () { |