Start removal of layout_* variables and replace these with new mechanisms to allow nextgen SDK generation (from Poky)

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

5 files changed, 42 insertions, 42 deletions

diff --git a/recipes/libtool/libtool-cross_1.5.10.bb b/recipes/libtool/libtool-cross_1.5.10.bb
index 910ff12066..1ae9c6884d 100644
--- a/recipes/libtool/libtool-cross_1.5.10.bb
+++ b/recipes/libtool/libtool-cross_1.5.10.bb
@@ -13,8 +13,8 @@ SRC_URI_append = " file://rpath-control.patch;patch=1 \
 
 S = "${WORKDIR}/libtool-${PV}"
 
-prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
-exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
 do_configure_prepend () {
@@ -34,12 +34,12 @@ do_compile () {
 do_stage () {
         install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool
         install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
-        install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal
-        install -c config.guess ${STAGING_DATADIR}/libtool/
-        install -c config.sub ${STAGING_DATADIR}/libtool/
-        install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/
-        install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/
-        install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/
+        install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal
+        install -c config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/
+        install -c config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/
+        install -c -m 0644 ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/
+        install -c -m 0644 libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
+        install -c -m 0644 ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
 }
 
 do_install () {
diff --git a/recipes/libtool/libtool-cross_1.5.22.bb b/recipes/libtool/libtool-cross_1.5.22.bb
index b0cee4eebb..383261217c 100644
--- a/recipes/libtool/libtool-cross_1.5.22.bb
+++ b/recipes/libtool/libtool-cross_1.5.22.bb
@@ -12,8 +12,8 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://install-path-check.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
-prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
-exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
 do_compile () {
@@ -23,12 +23,12 @@ do_compile () {
 do_stage () {
         install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool
         install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
-        install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal
-        install -c config.guess ${STAGING_DATADIR}/libtool/
-        install -c config.sub ${STAGING_DATADIR}/libtool/
-        install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/
-        install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/
-        install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/
+        install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal
+        install -c config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/
+        install -c config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/
+        install -c -m 0644 ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/
+        install -c -m 0644 libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
+        install -c -m 0644 ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
 }
 
 do_install () {
diff --git a/recipes/libtool/libtool-cross_1.5.24.bb b/recipes/libtool/libtool-cross_1.5.24.bb
index 1f8527873f..211e5a3550 100644
--- a/recipes/libtool/libtool-cross_1.5.24.bb
+++ b/recipes/libtool/libtool-cross_1.5.24.bb
@@ -9,8 +9,8 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \
                    file://install-path-check.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
-prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
-exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
 do_compile () {
@@ -20,12 +20,12 @@ do_compile () {
 do_stage () {
         install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool
         install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
-        install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal
-        install -c config.guess ${STAGING_DATADIR}/libtool/
-        install -c config.sub ${STAGING_DATADIR}/libtool/
-        install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/
-        install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/
-        install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/
+        install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal
+        install -c config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/
+        install -c config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/
+        install -c -m 0644 ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/
+        install -c -m 0644 libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
+        install -c -m 0644 ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
 }
 
 do_install () {
diff --git a/recipes/libtool/libtool-cross_2.2.4.bb b/recipes/libtool/libtool-cross_2.2.4.bb
index 31a67f5bd1..1a60b57970 100644
--- a/recipes/libtool/libtool-cross_2.2.4.bb
+++ b/recipes/libtool/libtool-cross_2.2.4.bb
@@ -17,8 +17,8 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1"
 
 S = "${WORKDIR}/libtool-${PV}"
 
-prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
-exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
 do_compile () {
@@ -27,14 +27,14 @@ do_compile () {
 
 do_stage () {
 	install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool
-	install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal
-	install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/
-	install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/
-	install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DATADIR}/libtool/
-	install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/
-	install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/
+	install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal
+	install -c ${S}/libltdl/config/config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/
+	install -c ${S}/libltdl/config/config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/
+	install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/
+	install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
+	install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
 	if [ -e ${WORKDIR}/dolt.m4 ] ; then
-		install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DATADIR}/aclocal/
+		install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
 	fi
 }
 
diff --git a/recipes/libtool/libtool-cross_2.2.6a.bb b/recipes/libtool/libtool-cross_2.2.6a.bb
index 23c16829ab..d3ea34a341 100644
--- a/recipes/libtool/libtool-cross_2.2.6a.bb
+++ b/recipes/libtool/libtool-cross_2.2.6a.bb
@@ -15,8 +15,8 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1"
 #SRC_URI_append_linux = "${DOLT_PATCH}"
 #SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}"
 
-prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
-exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
 do_compile () {
@@ -25,14 +25,14 @@ do_compile () {
 
 do_stage () {
 	install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool
-	install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal
-	install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/
-	install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/
-	install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DATADIR}/libtool/
-	install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/
-	install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/
+	install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal
+	install -c ${S}/libltdl/config/config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/
+	install -c ${S}/libltdl/config/config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/
+	install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/
+	install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
+	install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
 	if [ -e ${WORKDIR}/dolt.m4 ] ; then
-		install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DATADIR}/aclocal/
+		install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/
 	fi
 }