diff options
| author | Leon Woestenberg <leon.woestenberg@gmail.com> | 2008-05-11 21:19:51 +0000 |
|---|---|---|
| committer | Leon Woestenberg <leon.woestenberg@gmail.com> | 2008-05-11 21:19:51 +0000 |
| commit | 8b565072694f0dd213e48eb47a83ee31eecccab8 (patch) | |
| tree | 9c3119f1f1da43b17ef176f7987edfa61cef47fa /classes | |
| parent | 11a5ea4db23cca76ab6711f98a51a0a61654c2a1 (diff) | |
autotools.bbclass: from OM. Needed as commit 85a5e185b6a21e42e4243ad17befe40373025e0e alone will break uclibc/gettext builds.
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 5b921dce5d..010f4ab620 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -172,7 +172,7 @@ autotools_stage_dir() { rmdir "$from" 2> /dev/null || true if [ -d "$from" ]; then mkdir -p "$to" - cp -fpPR "$from"/* "$to" + cp -fpPR -t "$to" "$from"/* fi } @@ -205,8 +205,8 @@ autotools_stage_all() { for i in $las do dir=$(dirname $i) - echo "oe_libinstall -C ${S} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}" - oe_libinstall -C ${S} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir} + echo "oe_libinstall -C ${STAGE_TEMP}/${libdir}/${dir} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}" + oe_libinstall -C ${STAGE_TEMP}/${libdir}/${dir} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir} done else # Otherwise libtool wasn't used, and lib/ can be copied @@ -233,3 +233,4 @@ autotools_stage_all() { } EXPORT_FUNCTIONS do_configure do_install + |