linux-libc-headers: Do not hardcode /usr.

diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
index f65bf14..014fd23 100644 (file)
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.18.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \
            file://arm-syscall-define.patch;patch=1"
@@ -38,7 +38,7 @@ do_compile () {
 
 do_install() {
        set_arch
-       oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=${ARCH}
+       oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=${ARCH}
 }
 
 do_install_append_arm() {
@@ -51,7 +51,7 @@ do_stage () {
        set_arch
        rm -rf ${STAGE_TEMP}
        mkdir -p ${STAGE_TEMP}
-       oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=${ARCH}
+       oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=${ARCH}
        if [ "${ARCH}" == "arm" ]; then
                cp include/asm-arm/procinfo.h ${STAGE_TEMP}${includedir}/asm
        fi

diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
index 0b61128..8794b17 100644 (file)
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h"
@@ -40,7 +40,7 @@ do_compile () {
 
 do_install() {
        set_arch
-       oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH
+       oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
 }
 
 do_install_append_arm() {
@@ -54,7 +54,7 @@ do_stage () {
        echo $ARCH
        rm -rf ${STAGE_TEMP}
        mkdir -p ${STAGE_TEMP}
-       oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH
+       oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=$ARCH
        if [ "$ARCH" = "arm" ]; then
                cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/
        fi

diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
index 43a5cb9..595edde 100644 (file)
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h"
@@ -40,7 +40,7 @@ do_compile () {
 
 do_install() {
        set_arch
-       oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH
+       oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
 }
 
 do_install_append_arm() {
@@ -54,7 +54,7 @@ do_stage () {
        echo $ARCH
        rm -rf ${STAGE_TEMP}
        mkdir -p ${STAGE_TEMP}
-       oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH
+       oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=$ARCH
        if [ "$ARCH" = "arm" ]; then
                cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/
        fi

diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
index 43a5cb9..595edde 100644 (file)
--- a/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
+++ b/packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://procinfo.h"
@@ -40,7 +40,7 @@ do_compile () {
 
 do_install() {
        set_arch
-       oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH
+       oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
 }
 
 do_install_append_arm() {
@@ -54,7 +54,7 @@ do_stage () {
        echo $ARCH
        rm -rf ${STAGE_TEMP}
        mkdir -p ${STAGE_TEMP}
-       oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH
+       oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=$ARCH
        if [ "$ARCH" = "arm" ]; then
                cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/
        fi