diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2006-09-14 02:50:20 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2006-09-14 02:50:20 +0000 |
| commit | 67996f29bcf9e368b801b6d6ef52bc6c4f000dcc (patch) | |
| tree | 885f059826bb89f27d0de0db54bcc5485617bd03 | |
| parent | a9d54e2017021c13961749b8ce56dfbe261be8fc (diff) | |
| parent | 2147439068bd10a83e3b3705f5beb566391310b1 (diff) | |
merge of '663deec10df075626151f1dcb867068e0e526266'
and 'de34b2edcff91126ab8efe054f15964ad639fc4e'
| -rw-r--r-- | classes/binconfig.bbclass | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index bf15ebcdf9..34021845ee 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -5,11 +5,12 @@ def get_binconfig_mangle(d): import bb.data s = "-e ''" if not bb.data.inherits_class('native', d): - s += " -e 's:=${libdir}:=OELIBDIR:;'" - s += " -e 's:=${includedir}:=OEINCDIR:;'" - s += " -e 's:=${datadir}:=OEDATADIR:'" - s += " -e 's:=${prefix}:=OEPREFIX:'" - s += " -e 's:=${exec_prefix}:=OEEXECPREFIX:'" + optional_quote = r"\(\"\?\)" + 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:-L${libdir}:-LOELIBDIR:;'" s += " -e 's:-I${includedir}:-IOEINCDIR:;'" s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" |