summaryrefslogtreecommitdiff
path: root/libmysql
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
commit8ef28b496230ab67630dbe4a9adf3c217690b425 (patch)
tree3225891d5cfadb66f761de37a6ec8f85ca6ac751 /libmysql
parente642140b182e4ba0688b91c0870dfb5500b149f0 (diff)
parent6df2af22ceda4a59fc43a661f6ecfac362e9783a (diff)
downloadmariadb-git-8ef28b496230ab67630dbe4a9adf3c217690b425.tar.gz
Auto-merge
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/Makefile.shared2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared
index 43e86ea31e8..3e93b7daf84 100644
--- a/libmysql/Makefile.shared
+++ b/libmysql/Makefile.shared
@@ -85,7 +85,7 @@ BUILT_SOURCES = link_sources
CLEANFILES = $(target_libadd) $(SHLIBOBJS) \
$(target) $(BUILT_SOURCES)
DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
- -DDATADIR="\"$(MYSQLDATAdir)\"" \
+ -DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \
-DDEFAULT_HOME_ENV=MYSQL_HOME \
-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \