[oe-commits] Khem Raj : perl_5.8.8.bb: Fix compilation when bindir is not /usr/bin

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 1578d2e0a527f2baa6ccda851fcb51c72ba40fbf
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1578d2e0a527f2baa6ccda851fcb51c72ba40fbf

Author: Khem Raj <raj.khem at gmail.com>
Date:   Fri Sep  4 15:39:51 2009 -0700

perl_5.8.8.bb: Fix compilation when bindir is not /usr/bin

* Right now default perl installation happens in /usr prefix
  This patch tries to depend upong layout_prefix to decide on
  where to install. This is required for distros like micro
  who flatten the install tree and do not use /usr prefix

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/perl/perl_5.8.8.bb |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/perl/perl_5.8.8.bb b/recipes/perl/perl_5.8.8.bb
index 8d97199..8f6b72b 100644
--- a/recipes/perl/perl_5.8.8.bb
+++ b/recipes/perl/perl_5.8.8.bb
@@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL"
 PRIORITY = "optional"
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db perl-native grep-native"
-PR = "r27"
+PR = "r28"
 
 # Major part of version
 PVM = "5.8"
@@ -81,6 +81,7 @@ do_configure() {
         sed -i -e 's, at DESTDIR@,${D},g' \
                -e 's, at ARCH@,${TARGET_ARCH}-${TARGET_OS},g' \
                -e "s%/usr/include/%${STAGING_INCDIR}/%g" \
+	       -e 's,/usr/,${layout_exec_prefix}/,g' \
             config.sh-${TARGET_ARCH}-${TARGET_OS}
 
         if test "${MACHINE}" != "native"; then
@@ -103,10 +104,9 @@ do_compile() {
         oe_runmake perl LD="${TARGET_SYS}-gcc"
 }
 do_install() {
-        oe_runmake install
-
+	oe_runmake install
         # Add perl pointing at current version
-        ln -sf perl${PV} ${D}/usr/bin/perl
+        ln -sf perl${PV} ${D}${bindir}/perl
 
         # Fix up versioned directories
         mv ${D}/${libdir}/perl/${PVM} ${D}/${libdir}/perl/${PV}