From 817a98d74aef5726799af6ba78814dd633ebd699 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Tue, 31 May 2011 17:06:22 +0100 Subject: binconfig: improve handling of empty prefixes This is a backport of 952e5e2b7a5c1deefc939594d40b81a71fb16a54 from oe master. Without this the script mangling goes very wrong if ${prefix}="". There isn't really any way to fix this in the completely general case, but this patch does work with the two cases I tested (freetype and gpg-error) which were unusable previously. (From OE-Core rev: 854b15bf631452150d1979dfd8286b306f108688) Signed-off-by: Phil Blundell Signed-off-by: Richard Purdie --- meta/classes/binconfig.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes/binconfig.bbclass') diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass index 8e22d2d292..3deb5415e3 100644 --- a/meta/classes/binconfig.bbclass +++ b/meta/classes/binconfig.bbclass @@ -6,8 +6,8 @@ def get_binconfig_mangle(d): s += " -e 's:=%s${libdir}:=\\1OELIBDIR:;'" % optional_quote s += " -e 's:=%s${includedir}:=\\1OEINCDIR:;'" % optional_quote s += " -e 's:=%s${datadir}:=\\1OEDATADIR:'" % optional_quote - s += " -e 's:=%s${prefix}:=\\1OEPREFIX:'" % optional_quote - s += " -e 's:=%s${exec_prefix}:=\\1OEEXECPREFIX:'" % optional_quote + s += " -e 's:=%s${prefix}/:=\\1OEPREFIX/:'" % optional_quote + s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote s += " -e 's:-L${libdir}:-LOELIBDIR:;'" s += " -e 's:-I${includedir}:-IOEINCDIR:;'" s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" -- cgit v1.2.3-54-g00ecf