summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <msvensson@shellback.(none)>2006-04-10 15:11:37 +0200
committerunknown <msvensson@shellback.(none)>2006-04-10 15:11:37 +0200
commitf2ff24bd62f8b588f5966e115c1ec26c64e0a913 (patch)
tree460fd6dba045c92bd9987074d083601951a351e7 /libmysql
parent232dec09d9399efcc63c06e2a3aaba0713c31368 (diff)
downloadmariadb-git-f2ff24bd62f8b588f5966e115c1ec26c64e0a913.tar.gz
Bug#15069 [patch] my_print_defaults does'nt care --sysconfdir
- Grab the path from "configure --sysconfdir=<path>" and set it as the first place to look for my.cnf files Do this both in Makefiles for libmysql and mysys - Patch provided by Francesco Riosa. Thank you! libmysql/Makefile.shared: Grab the path from "--sysconfdir=<path>" into the defined variable DEFAULT_SYSYCONFDIR mysys/Makefile.am: Grab the path from "--sysconfdir=<path>" into the defined variable DEFAULT_SYSYCONFDIR mysys/default.c: Use DEFAULT_SYSCONFDIR as first place to look for my.cnf file if "--sysconfdir=<path>" been specified as argument to configure
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/Makefile.shared1
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared
index c4c9c0036e2..fd0a4eb051d 100644
--- a/libmysql/Makefile.shared
+++ b/libmysql/Makefile.shared
@@ -85,6 +85,7 @@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
-DDATADIR="\"$(MYSQLDATAdir)\"" \
-DDEFAULT_HOME_ENV=MYSQL_HOME \
-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
+ -DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
# The automatic dependencies miss this