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 | 008dd95f70a53335f7979e553f7178dfce2565ab (patch) | |
tree | 3225891d5cfadb66f761de37a6ec8f85ca6ac751 /libmysql | |
parent | 4e95179af9c2f2589093ea9f94472d8d047892c7 (diff) | |
parent | 09877515f22be7b4cbd0a96be4814f6024ad6ce3 (diff) | |
download | mariadb-git-008dd95f70a53335f7979e553f7178dfce2565ab.tar.gz |
Auto-merge
Diffstat (limited to 'libmysql')
-rw-r--r-- | libmysql/Makefile.shared | 2 |
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)\"" \ |