diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-12-11 09:42:16 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-12-11 09:42:16 +0000 |
| commit | 7bcf4828673040af5022534981de6416f5884cff (patch) | |
| tree | 18ab00a9b6f1ce29fa7b613662e256785fb59781 /classes/binconfig.bbclass | |
| parent | 84b2b31930881004a73267cf24fe6fe701e0f8a8 (diff) | |
| parent | 78c32ad25a3883dc7a127a36673890225f9f54f2 (diff) | |
propagate from branch 'org.openembedded.dev' (head acccc4840b95c279164a3eeacf893200164bdc65)
to branch 'org.openembedded.dev.avr32' (head 4a915ee0a28076c53049330f3f2e58c7b85ef7a8)
Diffstat (limited to 'classes/binconfig.bbclass')
| -rw-r--r-- | classes/binconfig.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index 497b78f454..4e425a76d6 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -16,8 +16,8 @@ def get_binconfig_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:-I${WORKDIR}:-I${STAGING_INCDIR}:'" s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'" return s @@ -33,7 +33,7 @@ do_install_append() { -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ -e 's:${STAGING_INCDIR}:${includedir}:g;' \ -e 's:${STAGING_DATADIR}:${datadir}:' \ - -e 's:${STAGING_LIBDIR}/..:${prefix}:' > ${D}${bindir}/`basename $config` + -e 's:${STAGING_DIR_HOST}${layout_prefix}:${prefix}:' > ${D}${bindir}/`basename $config` done fi @@ -42,7 +42,7 @@ do_install_append() { -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ -e 's:${STAGING_INCDIR}:${includedir}:g;' \ -e 's:${STAGING_DATADIR}:${datadir}:' \ - -e 's:${STAGING_LIBDIR}/..:${prefix}:' \ + -e 's:${STAGING_DIR_HOST}${layout_prefix}:${prefix}:' \ $lafile done } |