2 files changed, 20 insertions, 12 deletions

diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc
index 5373d56d57..c1c38534b7 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -74,3 +74,23 @@ EXTRA_OEMAKE += "rootsbindir=${base_sbindir}"
 
 inherit libc-common
 
+do_install_locale () {
+        dest=${D}/${includedir}/glibc-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}${libdir}/gconv ${dest}${libdir}
+        cp -fpPR ${D}${libdir}/* ${dest}${libdir}
+        mv ${D}${datadir}/i18n ${dest}${datadir}
+        cp -fpPR ${D}${datadir}/* ${dest}${datadir}
+        cp -fpPR ${WORKDIR}/SUPPORTED ${dest}
+}
+
+addtask do_install_locale after do_install before do_populate_sysroot
+
+PACKAGE_PREPROCESS_FUNCS += "glibc_package_preprocess"
+
+glibc_package_preprocess () {
+        rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
+}
+
diff --git a/meta/recipes-core/glibc/glibc_2.10.1.bb b/meta/recipes-core/glibc/glibc_2.10.1.bb
index 4d57c4ed32..e76f3c0194 100644
--- a/meta/recipes-core/glibc/glibc_2.10.1.bb
+++ b/meta/recipes-core/glibc/glibc_2.10.1.bb
@@ -154,18 +154,6 @@ do_compile () {
         )
 }
 
-do_install_locale () {
-        dest=${D}/${includedir}/glibc-locale-internal-${MULTIMACH_TARGET_SYS}
-        install -d ${dest} ${dest}${bindir}
-        cp -fpPR ${D}${base_libdir} ${dest}${base_prefix}
-        cp -fpPR ${D}${libdir} ${dest}${exec_prefix}
-        cp -fpPR ${D}${datadir} ${dest}${exec_prefix}
-        cp -fpPR ${D}${bindir}/localedef ${dest}${bindir}
-        cp -fpPR ${WORKDIR}/SUPPORTED ${dest}
-}
-
-addtask do_install_locale after do_install before do_populate_sysroot
-
 require glibc-stage.inc
 
 require glibc-package.inc