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.

(From OE-Core rev: b744f4cc2912334b8493a89525fd02af8e9b8edf)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index 296afdef6e..105cf2efd3 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -69,12 +69,12 @@ FILES_localedef = "${bindir}/localedef"
 LOCALETREESRC = "${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}"
 
 do_install () {
-        mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir}
+        mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir} ${D}${localedir}
         if [ -n "$(ls ${LOCALETREESRC}/${bindir})" ]; then
                 cp -fpPR ${LOCALETREESRC}/${bindir}/* ${D}${bindir}
         fi
-        if [ -e ${LOCALETREESRC}/${libdir}/locale ]; then
-                cp -fpPR ${LOCALETREESRC}/${libdir}/locale ${D}${libdir}
+        if [ -n "$(ls ${LOCALETREESRC}/${localedir})" ]; then
+                cp -fpPR ${LOCALETREESRC}/${localedir}/* ${D}${localedir}
         fi
         if [ -e ${LOCALETREESRC}/${libdir}/gconv ]; then
                 cp -fpPR ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir}