From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qh1xn-0007wJ-RA for garchives@archives.gentoo.org; Wed, 13 Jul 2011 16:07:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C505221C04C; Wed, 13 Jul 2011 16:06:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 98CE121C04C for ; Wed, 13 Jul 2011 16:06:55 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 049722AC255 for ; Wed, 13 Jul 2011 16:06:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5A7088003D for ; Wed, 13 Jul 2011 16:06:54 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <11a56eab2c09e38d4313e19dd4d904119ec4aabd.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql_fx.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: 11a56eab2c09e38d4313e19dd4d904119ec4aabd Date: Wed, 13 Jul 2011 16:06:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 590cdf009980d5cf4d55873d46c01ae2 commit: 11a56eab2c09e38d4313e19dd4d904119ec4aabd Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Wed Jul 13 16:03:17 2011 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Wed Jul 13 16:04:48 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3D11a56eab Set includedir appropriately for mariadb and mysql - fixes bug 375063. --- eclass/mysql_fx.eclass | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/eclass/mysql_fx.eclass b/eclass/mysql_fx.eclass index a2a4b50..047b208 100644 --- a/eclass/mysql_fx.eclass +++ b/eclass/mysql_fx.eclass @@ -230,7 +230,11 @@ mysql_init_vars() { MY_LIBDIR=3D${MY_LIBDIR=3D"/usr/$(get_libdir)/mysql"} MY_LOCALSTATEDIR=3D${MY_LOCALSTATEDIR=3D"/var/lib/mysql"} MY_LOGDIR=3D${MY_LOGDIR=3D"/var/log/mysql"} - MY_INCLUDEDIR=3D${MY_INCLUDEDIR=3D"/usr/include/mysql"} + if [[ ${PN} =3D=3D "mariadb" ]]; then + MY_INCLUDEDIR=3D${MY_INCLUDEDIR=3D"/usr/include/mysql"} + else + MY_INCLUDEDIR=3D${MY_INCLUDEDIR=3D"/usr/include"} + fi =20 if [[ -z "${MY_DATADIR}" ]] ; then MY_DATADIR=3D""