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 | 6df2af22ceda4a59fc43a661f6ecfac362e9783a (patch) | |
| tree | 1ec946eb73a7116ce88cd568b44517de785490e0 /libmysql | |
| parent | ba9042167469f9dfd620aeebbce4d034caac26a1 (diff) | |
| download | mariadb-git-6df2af22ceda4a59fc43a661f6ecfac362e9783a.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 '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 ad0ac53cfba..b7942d20cea 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -82,7 +82,7 @@ vio_objects= vio.lo viosocket.lo viossl.lo viosslfactories.lo CLEANFILES = $(target_libadd) $(SHLIBOBJS) \ $(target) 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)\"" \ |