eglibc: avoid copying ${libdir} twice if it's the same as ${base_libdir}

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

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 1c6626c187f8599aff71280c250935c9beae9614..f29417f94f3c81560125abc871f938501b267434 100644 (file)
--- 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}