summaryrefslogtreecommitdiff
path: root/storage
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 /storage
parent4e95179af9c2f2589093ea9f94472d8d047892c7 (diff)
parent09877515f22be7b4cbd0a96be4814f6024ad6ce3 (diff)
downloadmariadb-git-008dd95f70a53335f7979e553f7178dfce2565ab.tar.gz
Auto-merge
Diffstat (limited to 'storage')
-rw-r--r--storage/ndb/src/mgmsrv/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/ndb/src/mgmsrv/Makefile.am b/storage/ndb/src/mgmsrv/Makefile.am
index c19f885ae8d..3f37280d7a5 100644
--- a/storage/ndb/src/mgmsrv/Makefile.am
+++ b/storage/ndb/src/mgmsrv/Makefile.am
@@ -48,7 +48,7 @@ LDADD_LOC = $(top_builddir)/storage/ndb/src/mgmclient/CommandInterpreter.lo \
@TERMCAP_LIB@
DEFS_LOC = -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
- -DDATADIR="\"$(MYSQLDATAdir)\"" \
+ -DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
-DMYSQLCLUSTERDIR="\"$(MYSQLCLUSTERdir)\""