summaryrefslogtreecommitdiff
path: root/meta/recipes-core/eglibc/eglibc-package.inc
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2012-09-24 12:00:41 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-25 09:35:55 +0100
commitb744f4cc2912334b8493a89525fd02af8e9b8edf (patch)
tree9cbacbc93cabaff5298e48095f66cda5ff9440f4 /meta/recipes-core/eglibc/eglibc-package.inc
parent9327ca868667b15f29af3123611d6f56b4249a63 (diff)
downloadopenembedded-core-b744f4cc2912334b8493a89525fd02af8e9b8edf.tar.gz
openembedded-core-b744f4cc2912334b8493a89525fd02af8e9b8edf.tar.bz2
openembedded-core-b744f4cc2912334b8493a89525fd02af8e9b8edf.zip
Add and use 'localedir' variable
This avoids the hardcoding of ${libdir}/locale which is all over the place, and will facilitate use of ${exec_prefix}/lib/locale instead of ${libdir}/locale. This doesn't actually change any output at this time. Verified this with buildhistory against the packages produced from core-image-base. Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc/eglibc-package.inc')
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc11
1 files changed, 8 insertions, 3 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index ab7540afb4..0059bcfc1c 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -98,7 +98,9 @@ do_install_locale () {
if [ -e ${D}${libdir}/gconv ]; then
mv -f ${D}${libdir}/gconv ${dest}${libdir}
fi
- cp -fpPR ${D}${libdir}/* ${dest}${libdir}
+ if [ -e ${D}${exec_prefix}/lib ]; then
+ cp -fpPR ${D}${exec_prefix}/lib ${dest}${exec_prefix}
+ fi
if [ -e ${D}${datadir}/i18n ]; then
mv ${D}${datadir}/i18n ${dest}${datadir}
fi
@@ -113,6 +115,9 @@ PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess"
eglibc_package_preprocess () {
rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
- rm -rf ${PKGD}/${libdir}/locale
+ rm -rf ${PKGD}/${localedir}
+ if [ "${libdir}" != "${exec_prefix}/lib" ]; then
+ # This dir only exists to hold locales
+ rm -rf ${PKGD}${exec_prefix}/lib
+ fi
}
-