[oe-commits] org.oe.dev autotools.bbclass: from OM. Needed as commit 85a5e185b6a21e42e4243ad17befe40373025e0e alone will break uclibc/gettext builds.

[likewise commit]

autotools.bbclass: from OM. Needed as commit 85a5e185b6a21e42e4243ad17befe40373025e0e alone will break uclibc/gettext builds.

Author: likewise at openembedded.org
Branch: org.openembedded.dev
Revision: 4b02add2b83e66d45ff3e840056487a7274d9011
ViewMTN: http://monotone.openembedded.org/revision/info/4b02add2b83e66d45ff3e840056487a7274d9011
Files:
1
classes/autotools.bbclass
Diffs:

#
# mt diff -rb10c1f37026de482bbfaf68d9f83abf2984e79fe -r4b02add2b83e66d45ff3e840056487a7274d9011
#
#
#
# patch "classes/autotools.bbclass"
#  from [a1ec1e20a8e54947ec2b6b362378264caa8dec67]
#    to [77ba9664d4d26f5edd362d75ede90780a2f3c741]
#
============================================================
--- classes/autotools.bbclass	a1ec1e20a8e54947ec2b6b362378264caa8dec67
+++ classes/autotools.bbclass	77ba9664d4d26f5edd362d75ede90780a2f3c741
@@ -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 @@ EXPORT_FUNCTIONS do_configure do_install
 }
 
 EXPORT_FUNCTIONS do_configure do_install
+