From 4b751ba2557d2e3f448f92589ee0c9d5e30f6388 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 17 Nov 2007 23:21:03 +0000 Subject: classes: Sync staging layout cleanups from Poky --- classes/pkgconfig.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes/pkgconfig.bbclass') diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index c795c8a709..c50e0b484f 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -15,8 +15,8 @@ def get_pkgconfig_mangle(d): s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'" s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'" - s += " -e 's:OEPREFIX:${STAGING_LIBDIR}/..:'" - s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'" + s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${layout_prefix}:'" + s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'" s += " -e 's:-L${WORKDIR}\S*: :g'" s += " -e 's:-I${WORKDIR}\S*: :g'" -- cgit v1.2.3 From 9ab421f1ccda2af88b9243b061a5108e7368387f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 8 Dec 2007 15:34:52 +0000 Subject: pkgconfig.bbclass: sed out references to staging as well --- classes/pkgconfig.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/pkgconfig.bbclass') diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index c50e0b484f..71c00551d9 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -24,7 +24,7 @@ def get_pkgconfig_mangle(d): do_install_append () { for pc in `find ${D} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do - sed -i ${@get_pkgconfig_mangle(d)} -e 's:${D}::g' ${pc} + sed -i ${@get_pkgconfig_mangle(d)} -e 's:${D}::g' -e 's:${STAGING_LIBDIR}:${libdir}:g' -e 's:${STAGING_INCDIR}:${includedir}:g' ${pc} done } -- cgit v1.2.3 From 5422ce8eb5dd8cf95e843d4b944fe4eb5859eee6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 8 Dec 2007 19:08:01 +0000 Subject: pkgconfig.bbclass: also catch ${STAGING_DIR_TARGET} --- classes/pkgconfig.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/pkgconfig.bbclass') diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index 71c00551d9..d2176d8b39 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -24,7 +24,7 @@ def get_pkgconfig_mangle(d): do_install_append () { for pc in `find ${D} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do - sed -i ${@get_pkgconfig_mangle(d)} -e 's:${D}::g' -e 's:${STAGING_LIBDIR}:${libdir}:g' -e 's:${STAGING_INCDIR}:${includedir}:g' ${pc} + sed -i ${@get_pkgconfig_mangle(d)} -e 's:${D}::g' -e 's:${STAGING_LIBDIR}:${libdir}:g' -e 's:${STAGING_INCDIR}:${includedir}:g' -e 's:${STAGING_DIR_TARGET}:${prefix}:g' ${pc} done } -- cgit v1.2.3