summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2014-07-19 10:18:41 +0000
committerFabian Groffen <grobian@gentoo.org>2014-07-19 10:18:41 +0000
commitf256097c537e528ae2cd05a66ac261de53986ab0 (patch)
tree58b1d2c085534f4a267a7a6f9d50aa1cf8f5ac87 /eclass/mysql-cmake.eclass
parentRoll dev channel mask for chromium-38. (diff)
downloadgentoo-2-f256097c537e528ae2cd05a66ac261de53986ab0.tar.gz
gentoo-2-f256097c537e528ae2cd05a66ac261de53986ab0.tar.bz2
gentoo-2-f256097c537e528ae2cd05a66ac261de53986ab0.zip
Fix misc issues for Prefix allowing install and config of mysql
Diffstat (limited to 'eclass/mysql-cmake.eclass')
-rw-r--r--eclass/mysql-cmake.eclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 1f398ea5e3e3..25012d13a1bd 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.21 2014/06/20 00:03:33 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.22 2014/07/19 10:18:41 grobian Exp $
# @ECLASS: mysql-cmake.eclass
# @MAINTAINER:
@@ -411,6 +411,7 @@ mysql-cmake_src_install() {
sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
"${FILESDIR}/${mycnf_src}" \
> "${TMPDIR}/my.cnf.ok" || die
+ use prefix && sed -i -e '/^user[ ]*= mysql$/d' "${TMPDIR}/my.cnf.ok"
if use latin1 ; then
sed -i \
-e "/character-set/s|utf8|latin1|g" \