autotools.bbclass: autotools_stage_all - improve handling of datadir

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

1 files changed, 6 insertions, 4 deletions

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 004ac79f03..97a4ac63fb 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -212,11 +212,13 @@ autotools_stage_all() {
                         cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
                 fi
         fi
-        if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then
-                install -d ${STAGING_DATADIR}/aclocal
-                cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
+        rm -rf ${STAGE_TEMP}/${mandir} || true
+        rm -rf ${STAGE_TEMP}/${infodir} || 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