[oe-commits] Pierluigi Passaro : mysql5: adopt to new style sysroot

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: c31636c6a910d246e00a955bdc88014cab6b565b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c31636c6a910d246e00a955bdc88014cab6b565b

Author: Pierluigi Passaro <pierluigi.passaro at phoenixsoftware.it>
Date:   Mon Oct  4 11:54:59 2010 +0200

mysql5: adopt to new style sysroot

Signed-off-by: Koen Kooi <koen at openembedded.org>

---

 recipes/mysql/mysql5_5.1.40.inc |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes/mysql/mysql5_5.1.40.inc b/recipes/mysql/mysql5_5.1.40.inc
index aa60947..1ebfe8d 100644
--- a/recipes/mysql/mysql5_5.1.40.inc
+++ b/recipes/mysql/mysql5_5.1.40.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mysql.com/"
 SECTION = "libs"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \
            file://configure.in.patch \
@@ -46,8 +46,8 @@ SYSROOT_PREPROCESS_FUNCS += "mysql5_sysroot_preprocess"
 
 # We need to append this so it runs *after* binconfig's preprocess function
 mysql5_sysroot_preprocess () {
-	sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config
-	sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config
+	sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/mysql_config
+	sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/mysql_config
 }
 
 do_install() {