diff options
| author |   Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2011-07-14 02:11:32 +0000 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2011-07-14 02:11:32 +0000 |
| commit | 68ee5e9806ebf475aa9fd4fb68c3a1698988e48f (patch) | |
| tree | 0e9951edf4477d4609f9205913ef4903b420989d /eclass | |
| parent | *portage-2.2.0_alpha45 (14 Jul 2011) (diff) | |
| download | gentoo-2-68ee5e9806ebf475aa9fd4fb68c3a1698988e48f.tar.gz gentoo-2-68ee5e9806ebf475aa9fd4fb68c3a1698988e48f.tar.bz2 gentoo-2-68ee5e9806ebf475aa9fd4fb68c3a1698988e48f.zip | |
Synced with mysql_fx from the mysql overlay.
Set includedir and libdir appropriately for mariadb and mysql - fixes bug 375063.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/mysql_fx.eclass | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass index 1d531c1dcc95..504f54ae3ba3 100644 --- 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.23 2011/07/13 07:07:15 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql_fx.eclass,v 1.24 2011/07/14 02:11:32 jmbsvicetto Exp $ # Author: Francesco Riosa (Retired) <vivo@gentoo.org> # Maintainer: @@ -227,10 +227,15 @@ mysql_lib_symlinks() { mysql_init_vars() { MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"} MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"} - MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"} MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"} MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"} - MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/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 if [[ -z "${MY_DATADIR}" ]] ; then MY_DATADIR="" |