perl: Standardise config.sh location

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index ca5303d97f..66054bc755 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -10,11 +10,13 @@ export PERLCONFIGTARGET = "${@is_target(d)}"
 
 # Env var which tells perl where the perl include files are
 export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE"
+export PERL_LIB = "${STAGING_DATADIR}/perl/${@get_perl_version(d)}"
+export PERL_ARCHLIB = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}"
 
 cpan_do_configure () {
         yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS}
         if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
-                . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh
+                . ${STAGING_LIBDIR}/perl/config.sh
                 if [ "${IS_NEW_PERL}" = "yes" ]; then
                         sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \
                                 -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \