autotools.bbclass: Handle case where is an empty directory

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4078 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 97a4ac63fbebb84e3aa3440dc962194d2d384646..0039b648a1469bd6aca72f5df945e8ec333fbe47 100644 (file)
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -214,11 +214,13 @@ autotools_stage_all() {
        fi
        rm -rf ${STAGE_TEMP}/${mandir} || true
        rm -rf ${STAGE_TEMP}/${infodir} || true
+       # This will remove an empty directory so we can ignore it
+       rmdir ${STAGE_TEMP}/${datadir} || true
        if [ -d ${STAGE_TEMP}/${datadir} ]; then
                install -d ${STAGING_DATADIR}/
                cp -fpPR ${STAGE_TEMP}/${datadir}/* ${STAGING_DATADIR}/
        fi
-       #rm -rf ${STAGE_TEMP}
+       rm -rf ${STAGE_TEMP}
 }
 
 EXPORT_FUNCTIONS do_configure do_install