[oe-commits] Richard Purdie : eglibc-package.bbclass: Ensure localedef is only packaged in one location

[git version control]

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

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Thu Jun 30 16:45:20 2011 +0100

eglibc-package.bbclass: Ensure localedef is only packaged in one location

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-core/eglibc/eglibc-package.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 8318356..1c6626c 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -92,7 +92,7 @@ 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}
-	cp -fpP ${D}${bindir}/localedef ${dest}${bindir}
+	mv ${D}${bindir}/localedef ${dest}${bindir}
         mv ${D}${libdir}/gconv ${dest}${libdir}
 	cp -fpPR ${D}${libdir}/* ${dest}${libdir}
         mv ${D}${datadir}/i18n ${dest}${datadir}
@@ -100,7 +100,7 @@ do_install_locale () {
 	cp -fpPR ${WORKDIR}/SUPPORTED ${dest}
 }
 
-addtask do_install_locale after do_install before do_populate_sysroot
+addtask do_install_locale after do_install before do_populate_sysroot do_package
 
 PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess"