mysql_config should point to the directory where the MySQL include files
can be found and not its parent.

This fixes building modphp with mysql enabled, and allows cherokee to
actually enable mysql support.

Signed-off-by: Paul Eggleton <[email protected]>
---
 meta-oe/recipes-support/mysql/mysql5_5.1.40.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc 
b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
index 9699dec..40b6b01 100644
--- a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
+++ b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=477ab0a4c8ca64b482b3f2a365d0fdfa"
 
 DEPENDS = "ncurses"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \
            file://configure.in.patch \
@@ -42,7 +42,7 @@ 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}\', 
${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config
+       sed -i 
-es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}/mysql\',
 ${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config
        sed -i 
-es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', 
${SYSROOT_DESTDIR}${bindir_crossscripts}/mysql_config
 }
 
-- 
1.7.9.5


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Reply via email to