summaryrefslogtreecommitdiff
path: root/sql/Makefile.am
diff options
context:
space:
mode:
authorIgnacio Galarza <iggy@mysql.com>2009-07-31 15:28:15 -0400
committerIgnacio Galarza <iggy@mysql.com>2009-07-31 15:28:15 -0400
commit008dd95f70a53335f7979e553f7178dfce2565ab (patch)
tree3225891d5cfadb66f761de37a6ec8f85ca6ac751 /sql/Makefile.am
parent4e95179af9c2f2589093ea9f94472d8d047892c7 (diff)
parent09877515f22be7b4cbd0a96be4814f6024ad6ce3 (diff)
downloadmariadb-git-008dd95f70a53335f7979e553f7178dfce2565ab.tar.gz
Auto-merge
Diffstat (limited to 'sql/Makefile.am')
-rw-r--r--sql/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am
index e477a6123ec..2a12de2eaf6 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -137,7 +137,7 @@ mysql_tzinfo_to_sql_CXXFLAGS= -DTZINFO2SQL
DEFS = -DMYSQL_SERVER \
-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
- -DDATADIR="\"$(MYSQLDATAdir)\"" \
+ -DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
-DPLUGINDIR="\"$(pkgplugindir)\"" \
-DHAVE_EVENT_SCHEDULER \