[gentoo-commits] gentoo-x86 commit in eclass: mysql_fx.eclass

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    11/07/29 02:51:25

  Modified:             mysql_fx.eclass
  Log:
  [eclass/mysql_fx] Synced with overlay eclass - should fix new missing /mysql issue - bug 375063.

Revision  Changes    Path
1.25                 eclass/mysql_fx.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql_fx.eclass?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql_fx.eclass?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql_fx.eclass?r1=1.24&r2=1.25

Index: mysql_fx.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mysql_fx.eclass	14 Jul 2011 02:11:32 -0000	1.24
+++ mysql_fx.eclass	29 Jul 2011 02:51:25 -0000	1.25
@@ -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@g.o>
 # Maintainer:
@@ -229,13 +229,8 @@
 	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=""