cpan_build: Unify directory layout for native and target builds

There seems to be no benefit in having them be different and this
appears to cause a certain amount of confusion about paths for
the native modules.

(From OE-Core rev: 3926a45a26c2d23d9c2fc9c3956f780f607ec7a4)

Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/cpan_build.bbclass b/meta/classes/cpan_build.bbclass
index 36ffc56..0809602 100644 (file)
--- a/meta/classes/cpan_build.bbclass
+++ b/meta/classes/cpan_build.bbclass
@@ -23,8 +23,9 @@ cpan_build_do_configure () {
        if [ ${@is_target(d)} == "yes" ]; then
                # build for target
                . ${STAGING_LIBDIR}/perl/config.sh
+       fi
 
-                       perl Build.PL --installdirs vendor \
+       perl Build.PL --installdirs vendor \
                                --destdir ${D} \
                                --install_path lib="${datadir}/perl" \
                                --install_path arch="${libdir}/perl" \
@@ -32,10 +33,6 @@ cpan_build_do_configure () {
                                --install_path bin=${bindir} \
                                --install_path bindoc=${mandir}/man1 \
                                --install_path libdoc=${mandir}/man3
-       else
-               # build for host
-               perl Build.PL --installdirs site --destdir ${D}
-       fi
 }
 
 cpan_build_do_compile () {