Remove hardcoded staging layout assumptions

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3117 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 2 insertions, 2 deletions

diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index 3250528c7a..5a0b4a5c92 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -20,14 +20,14 @@ cpan_do_configure () {
                                 -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \
                                 -e "s:\(INSTALLVENDORLIB = \).*:\1${D}${datadir}/perl5:" \
                                 -e "s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" \
-                                -e "s:\(LDDLFLAGS.*\)${STAGING_DIR}/${BUILD_SYS}/lib:\1${STAGING_LIBDIR}:" \
+                                -e "s:\(LDDLFLAGS.*\)${STAGING_LIBDIR_NATIVE}:\1${STAGING_LIBDIR}:" \
                                 Makefile
                 else
                         sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \
                                 -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \
                                 -e "s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5/site_perl/${version}:" \
                                 -e "s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5/site_perl/${version}:" \
-                                -e "s:\(LDDLFLAGS.*\)${STAGING_DIR}/${BUILD_SYS}/lib:\1${STAGING_LIBDIR}:" \
+                                -e "s:\(LDDLFLAGS.*\)${STAGING_LIBDIR_NATIVE}:\1${STAGING_LIBDIR}:" \
                                 Makefile
                 fi
         fi