[PATCH 0/1] alsa-tools: fix the AUTOMAKE_DIR

[PATCH 0/1] alsa-tools: fix the AUTOMAKE_DIR

[Robert Yang]

The following changes since commit 1b636173ca88e5ccca1992f9a12367a1189fa674:

  bitbake: toaster: Toaster GUI, generic search, filter and order (2014-01-10 15:20:26 +0000)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib rbt/at
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/at

Robert Yang (1):
  alsa-tools: fix the AUTOMAKE_DIR

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

-- 
1.8.3.1

[PATCH 1/1] alsa-tools: fix the AUTOMAKE_DIR

[Robert Yang]

There should be only one automake under the STAGING_DATADIR_NATIVE in
theory, but der_steffi@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@gmx.de
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 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}/"
 }
 
-- 
1.8.3.1