[oe-commits] Robert Yang : alsa-tools: fix the AUTOMAKE_DIR

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 59f46f9c9f8a36d8829b9b33291249a7b92ebcac
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=59f46f9c9f8a36d8829b9b33291249a7b92ebcac

Author: Robert Yang <liezhi.yang at windriver.com>
Date:   Tue Jan 14 10:42:13 2014 +0800

alsa-tools: fix the AUTOMAKE_DIR

There should be only one automake under the STAGING_DATADIR_NATIVE in
theory, but der_steffi at gmx.de has reported an odd problem which seemed
like that there are more than one. However, the "automake
--print-libdir" is the regular way to locate automake libdir.

[YOCTO #5706]

Reported-by: der_steffi at gmx.de
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
index c3b97a3..5b0f6ae 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.26.1.bb
@@ -32,7 +32,7 @@ do_configure () {
 
 do_compile_prepend () {
     #Automake dir is not correctly detected in cross compilation case
-    export AUTOMAKE_DIR=${STAGING_DATADIR_NATIVE}/$(ls ${STAGING_DATADIR_NATIVE} | grep automake)
+    export AUTOMAKE_DIR="$(automake --print-libdir)"
     export ACLOCAL_FLAGS="--system-acdir=${ACLOCALDIR}/"
 }