summaryrefslogtreecommitdiff
path: root/mysys/Makefile.am
diff options
context:
space:
mode:
authorunknown <jani@ua141d10.elisa.omakaista.fi>2005-01-04 20:13:47 +0200
committerunknown <jani@ua141d10.elisa.omakaista.fi>2005-01-04 20:13:47 +0200
commitb7322baddee283582b39ec3acc8c76d97e9dff66 (patch)
tree0c8c8b613d9325f9794f856d8ca791f9e10a225d /mysys/Makefile.am
parent592ffbcd68337c40dd75f2e052ee0479a120f8bd (diff)
downloadmariadb-git-b7322baddee283582b39ec3acc8c76d97e9dff66.tar.gz
Added checking for my.cnf file from environment variable MYSQL_HOME
instead of DATADIR. include/config-win.h: Added checks for environment variable MYSQL_HOME libmysql/Makefile.shared: Added checks for environment variable MYSQL_HOME mysys/Makefile.am: Added checks for environment variable MYSQL_HOME mysys/default.c: Removed checks for my.cnf file in datadir, instead added checking if my.cnf exists in environment variable MYSQL_HOME scripts/mysqld_multi.sh: Added checks for my.cnf file in environment variable MYSQL_HOME, if exists. scripts/mysqld_safe.sh: Added checks for my.cnf file in environment variable MYSQL_HOME, if exists.
Diffstat (limited to 'mysys/Makefile.am')
-rw-r--r--mysys/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am
index b0ca1b402ee..4698d06d8c3 100644
--- a/mysys/Makefile.am
+++ b/mysys/Makefile.am
@@ -66,6 +66,7 @@ DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \
-DDATADIR="\"$(MYSQLDATAdir)\"" \
-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
+ -DDEFAULT_HOME_ENV=MYSQL_HOME \
@DEFS@
libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@