From 9b753b06c1cd55b07e3ec62957a1a7554075542c Mon Sep 17 00:00:00 2001
From: Gerald Britton <gbritton@doomcom.org>
Date: Sun, 9 May 2004 05:28:44 +0000
Subject: fix install paths on libtool cross tools

BKrev: 409dc18cMDbv_ajw2oSbghn64aw0EA
---
 libtool/libtool-cross_1.5.oe  | 5 +++--
 libtool/libtool-native_1.5.oe | 3 ---
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'libtool')

diff --git a/libtool/libtool-cross_1.5.oe b/libtool/libtool-cross_1.5.oe
index d8230bde51..4aed5a34d4 100644
--- a/libtool/libtool-cross_1.5.oe
+++ b/libtool/libtool-cross_1.5.oe
@@ -11,8 +11,9 @@ SRC_URI_append = " file://${FILESDIR}/libdir-la.patch;patch=1 \
                    file://${FILESDIR}/chmod.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
-prefix = "${CROSS_DIR}"
-exec_prefix = "${prefix}"
+# This should match what native.oeclass does
+prefix = "${STAGING_DIR}"
+exec_prefix = "${prefix}/${BUILD_SYS}"
 
 do_compile () {
 }
diff --git a/libtool/libtool-native_1.5.oe b/libtool/libtool-native_1.5.oe
index 7014467e57..a34b8d43ad 100644
--- a/libtool/libtool-native_1.5.oe
+++ b/libtool/libtool-native_1.5.oe
@@ -13,9 +13,6 @@ SRC_URI_append = " file://${FILESDIR}/libdir-la.patch;patch=1 \
                    file://${FILESDIR}/install-path-check.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
-prefix = "${CROSS_DIR}"
-exec_prefix = "${prefix}"
-
 do_stage () {
         oe_runmake install
         install -d ${STAGING_DATADIR}/libtool \
-- 
cgit v1.2.3