diff options
| author | Ignacio Galarza <iggy@mysql.com> | 2009-07-31 15:22:02 -0400 |
|---|---|---|
| committer | Ignacio Galarza <iggy@mysql.com> | 2009-07-31 15:22:02 -0400 |
| commit | 09877515f22be7b4cbd0a96be4814f6024ad6ce3 (patch) | |
| tree | 1ec946eb73a7116ce88cd568b44517de785490e0 /mysys/Makefile.am | |
| parent | 7fc27f3dd5e4c1b30dcf6d725b8f2b037cfbbb2b (diff) | |
| download | mariadb-git-09877515f22be7b4cbd0a96be4814f6024ad6ce3.tar.gz | |
Bug#17270 - mysql client tool could not find ../share/charsets folder and fails.
- Define and pass compile time path variables as pre-processor definitions to
mimic the makefile build.
- Set new CMake version and policy requirements explicitly.
- Changed DATADIR to MYSQL_DATADIR to avoid conflicting definition in
Platform SDK header ObjIdl.h which also defines DATADIR.
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 8c6bf5f7006..7cb87492b40 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -66,7 +66,7 @@ libmysys_a_LIBADD = @THREAD_LOBJECTS@ # charset2html_DEPENDENCIES= $(LIBRARIES) EXTRA_PROGRAMS = DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \ - -DDATADIR="\"$(MYSQLDATAdir)\"" \ + -DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \ -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ -DDEFAULT_HOME_ENV=MYSQL_HOME \ |