From 9366a6fbb285ae73824ad2947614a241ac952799 Mon Sep 17 00:00:00 2001
From: Nick D'Ademo <nickdademo@gmail.com>
Date: Tue, 26 Nov 2013 17:26:46 +1100
Subject: [PATCH] libav: install libraries to right directory when multilib is
 enabled

Explicitly set libdir and shlibdir to ${libdir} in EXTRA_OECONF. Otherwise, default library path of ${prefix}/lib is used which is incorrect in a multilib build.

(From OE-Core master rev: e16b6bab8d5286cdf58d808ef4c195127d69a8c8)

(From OE-Core rev: 62e98e8f70adbf0b878d8410a801f94eba938ba5)

Signed-off-by: Nick D'Ademo <nickdademo@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-multimedia/libav/libav.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc
index c33f7edfe0..d53829b9a2 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/meta/recipes-multimedia/libav/libav.inc
@@ -55,6 +55,8 @@ EXTRA_OECONF = " \
     --sysroot="${STAGING_DIR_TARGET}" \
     --enable-hardcoded-tables \
     ${EXTRA_FFCONF} \
+    --libdir=${libdir} \
+    --shlibdir=${libdir} \
 "
 
 do_configure() {