[eclass/mysql_fx] Synced with overlay eclass - should fix new missing /mysql issue...

diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass
index 504f54ae3ba344df29bc526ccce903fb2da3bcc3..ef2331bab2f868b55285e94efb3451607bfdd3fb 100644 (file)
--- a/eclass/mysql_fx.eclass
+++ b/eclass/mysql_fx.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.24 2011/07/14 02:11:32 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.25 2011/07/29 02:51:25 jmbsvicetto Exp $
 
 # Author: Francesco Riosa (Retired) <vivo@gentoo.org>
 # Maintainer:
@@ -229,13 +229,8 @@ mysql_init_vars() {
        MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"}
        MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}
        MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}
-       if [[ ${PN} == "mariadb" ]]; then
-               MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
-               MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
-       else
-               MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include"}
-               MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)"}
-       fi
+       MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}
+       MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}
 
        if [[ -z "${MY_DATADIR}" ]] ; then
                MY_DATADIR=""