diff options
author | Richard Purdie <richard@openedhand.com> | 2008-03-19 20:19:50 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-03-19 20:19:50 +0000 |
commit | 80ec6694d7c661f6af946535919a662d7e8138f6 (patch) | |
tree | 03259b1e428f79c45c0c58f30fcd533e7e2287e3 /meta/classes/autotools.bbclass | |
parent | b26a7c4be98f6088cbb45b668d4d5f013b7e8351 (diff) | |
download | poky-80ec6694d7c661f6af946535919a662d7e8138f6.tar.gz |
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
Diffstat (limited to 'meta/classes/autotools.bbclass')
-rw-r--r-- | meta/classes/autotools.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 97a4ac63fb..0039b648a1 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass | |||
@@ -214,11 +214,13 @@ autotools_stage_all() { | |||
214 | fi | 214 | fi |
215 | rm -rf ${STAGE_TEMP}/${mandir} || true | 215 | rm -rf ${STAGE_TEMP}/${mandir} || true |
216 | rm -rf ${STAGE_TEMP}/${infodir} || true | 216 | rm -rf ${STAGE_TEMP}/${infodir} || true |
217 | # This will remove an empty directory so we can ignore it | ||
218 | rmdir ${STAGE_TEMP}/${datadir} || true | ||
217 | if [ -d ${STAGE_TEMP}/${datadir} ]; then | 219 | if [ -d ${STAGE_TEMP}/${datadir} ]; then |
218 | install -d ${STAGING_DATADIR}/ | 220 | install -d ${STAGING_DATADIR}/ |
219 | cp -fpPR ${STAGE_TEMP}/${datadir}/* ${STAGING_DATADIR}/ | 221 | cp -fpPR ${STAGE_TEMP}/${datadir}/* ${STAGING_DATADIR}/ |
220 | fi | 222 | fi |
221 | #rm -rf ${STAGE_TEMP} | 223 | rm -rf ${STAGE_TEMP} |
222 | } | 224 | } |
223 | 225 | ||
224 | EXPORT_FUNCTIONS do_configure do_install | 226 | EXPORT_FUNCTIONS do_configure do_install |