aboutsummaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorGregory M. Tuner <gmt@be-evil.net>2014-06-05 04:40:10 -0700
committerGregory M. Tuner <gmt@be-evil.net>2014-06-05 04:40:10 -0700
commit22098b23ea32c37ab2a326c7d2fb2be680e63a63 (patch)
tree886f874fae73d50952cc62b5762e8ae329d1a7c0 /eclass
parenteclass/mysql-v2.eclass: fix some mismerges (diff)
downloadgmt-22098b23ea32c37ab2a326c7d2fb2be680e63a63.tar.gz
gmt-22098b23ea32c37ab2a326c7d2fb2be680e63a63.tar.bz2
gmt-22098b23ea32c37ab2a326c7d2fb2be680e63a63.zip
eclass/mysql-v2: one more mismerged fixup
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/mysql-v2.eclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 1e7dd4b..c01ac8e 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -806,7 +806,7 @@ mysql-v2_pkg_config() {
#cmd="'${EROOT}/usr/share/mysql/scripts/mysql_install_db' '--basedir=${EPREFIX}/usr' ${options}"
cmd=${EROOT}usr/share/mysql/scripts/mysql_install_db
[[ -f ${cmd} ]] || cmd=${EROOT}usr/bin/mysql_install_db
- cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options}"
+ cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${EROOT}${MY_DATADIR}' '--tmpdir=${EROOT}${MYSQL_TMPDIR}'"
einfo "Command: $cmd"
eval $cmd \
>"${TMPDIR}"/mysql_install_db.log 2>&1