diff options
| author | Ignacio Galarza <iggy@mysql.com> | 2009-07-31 15:28:15 -0400 |
|---|---|---|
| committer | Ignacio Galarza <iggy@mysql.com> | 2009-07-31 15:28:15 -0400 |
| commit | 8ef28b496230ab67630dbe4a9adf3c217690b425 (patch) | |
| tree | 3225891d5cfadb66f761de37a6ec8f85ca6ac751 /libmysqld | |
| parent | e642140b182e4ba0688b91c0870dfb5500b149f0 (diff) | |
| parent | 6df2af22ceda4a59fc43a661f6ecfac362e9783a (diff) | |
| download | mariadb-git-8ef28b496230ab67630dbe4a9adf3c217690b425.tar.gz | |
Auto-merge
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index ef2fab2da6d..a9bd8d9e17c 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -26,7 +26,7 @@ pkgplugindir = $(pkglibdir)/plugin EXTRA_DIST = libmysqld.def CMakeLists.txt DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ - -DDATADIR="\"$(MYSQLDATAdir)\"" \ + -DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ -DPLUGINDIR="\"$(pkgplugindir)\"" INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \ |