[oe-commits] Koen Kooi : mariadb: handle seperate builddir

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 722d103fbe128302b8d0adb1ac652c59b5b4becc
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=722d103fbe128302b8d0adb1ac652c59b5b4becc

Author: Koen Kooi <koen.kooi at linaro.org>
Date:   Tue Apr 29 15:32:36 2014 +0200

mariadb: handle seperate builddir

Signed-off-by: Koen Kooi <koen.kooi at linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-support/mysql/mariadb_5.1.67.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc
index 861a9b8..0c83c71 100644
--- a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc
+++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc
@@ -28,7 +28,7 @@ S = "${WORKDIR}/mariadb-${PV}"
 
 BINCONFIG_GLOB = "mysql_config"
 
-inherit autotools binconfig update-rc.d useradd
+inherit autotools-brokensep binconfig update-rc.d useradd
 
 INITSCRIPT_PACKAGES = "${PN}-server"
 INITSCRIPT_NAME = "mysqld"
@@ -59,7 +59,7 @@ EXTRA_OECONF = "--with-atomic-ops=up \
                 "
 
 do_configure_append() {
-    sed -i /comp_err/d ${S}/sql/share/Makefile
+    sed -i /comp_err/d ${B}/sql/share/Makefile
 
     # handle distros with different values of ${libexecdir}
     libexecdir2=`echo ${libexecdir} | sed -e 's+/usr/++g'`