[oe-commits] Phil Blundell : eglibc: avoid copying ${libdir} twice if it' s the same as ${base_libdir}

[git version control]

Module: openembedded-core.git
Branch: master
Commit: f825e4ca619d3dc9c650343327a753eeb4a50e51
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f825e4ca619d3dc9c650343327a753eeb4a50e51

Author: Phil Blundell <pb at pbcl.net>
Date:   Fri Jul  8 20:48:39 2011 +0100

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 at gnu.org>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 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}