classes: Various staging improvement fixups

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index bd88184a74..4946222f78 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -170,14 +170,13 @@ autotools_stage_includes() {
 }
 
 autotools_stage_dir() {
-        sysroot_stage_dir $1 ${STAGE_TEMP_PREFIX}$2
+        sysroot_stage_dir $1 ${STAGE_TEMP_PREFIX}$2
 }
 
 autotools_stage_libdir() {
         sysroot_stage_libdir $1 ${STAGE_TEMP_PREFIX}$2
 }
 
-
 autotools_stage_all() {
         if [ "${INHIBIT_AUTO_STAGE}" = "1" ]
         then
@@ -186,8 +185,11 @@ autotools_stage_all() {
         rm -rf ${STAGE_TEMP}
         mkdir -p ${STAGE_TEMP}
         oe_runmake DESTDIR="${STAGE_TEMP}" install
-
+        rm -rf ${STAGE_TEMP}/${mandir} || true
+        rm -rf ${STAGE_TEMP}/${infodir} || true
         sysroot_stage_dirs ${STAGE_TEMP} ${STAGE_TEMP_PREFIX}
+        rm -rf ${STAGE_TEMP}
 }
 
 EXPORT_FUNCTIONS do_configure do_install
+