Otherwise the following "mv ${libdir}/gconv" fails because the destination
has already been created.

Signed-off-by: Phil Blundell <[email protected]>
---
 meta/recipes-core/eglibc/eglibc-package.inc |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/eglibc/eglibc-package.inc 
b/meta/recipes-core/eglibc/eglibc-package.inc
index 1c6626c..f29417f 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -91,9 +91,11 @@ inherit libc-common
 do_install_locale () {
        dest=${D}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
        install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} 
${dest}${datadir}
-       cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
+       if [ "${base_libdir}" != "${libdir}" ]; then
+               cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
+       fi
        mv ${D}${bindir}/localedef ${dest}${bindir}
-        mv ${D}${libdir}/gconv ${dest}${libdir}
+       mv ${D}${libdir}/gconv ${dest}${libdir}
        cp -fpPR ${D}${libdir}/* ${dest}${libdir}
         mv ${D}${datadir}/i18n ${dest}${datadir}
        cp -fpPR ${D}${datadir}/* ${dest}${datadir}
-- 
1.7.4.1




_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Reply via email to