[oe-commits] Phil Blundell : cpan_build: Unify directory layout for native and target builds

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 3926a45a26c2d23d9c2fc9c3956f780f607ec7a4
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3926a45a26c2d23d9c2fc9c3956f780f607ec7a4

Author: Phil Blundell <philb at gnu.org>
Date:   Tue Sep 25 22:33:01 2012 +0100

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.

Signed-off-by: Phil Blundell <pb at pbcl.net>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/classes/cpan_build.bbclass |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta/classes/cpan_build.bbclass b/meta/classes/cpan_build.bbclass
index 36ffc56..0809602 100644
--- 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 () {