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 /mysys/Makefile.am | |
| parent | 4e95179af9c2f2589093ea9f94472d8d047892c7 (diff) | |
| parent | 09877515f22be7b4cbd0a96be4814f6024ad6ce3 (diff) | |
| download | mariadb-git-008dd95f70a53335f7979e553f7178dfce2565ab.tar.gz | |
Auto-merge
Diffstat (limited to 'mysys/Makefile.am')
| -rw-r--r-- | mysys/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am index 3312c692c09..8fea7fff4b0 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -63,7 +63,7 @@ libmysys_a_LIBADD = @THREAD_LOBJECTS@ # test_charset_DEPENDENCIES= $(LIBRARIES) # charset2html_DEPENDENCIES= $(LIBRARIES) DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \ - -DDATADIR="\"$(MYSQLDATAdir)\"" \ + -DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \ -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ -DDEFAULT_HOME_ENV=MYSQL_HOME \ |