autotools.bbclass: add INHIBIT_AUTO_STAGE_INCLUDES

native.bbclass: add INHIBIT_NATIVE_STAGE_INSTALL

diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 1d6a607..8a387da 100644 (file)
--- 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 3391694..955a8ae 100644 (file)
--- 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 () {