From 09877515f22be7b4cbd0a96be4814f6024ad6ce3 Mon Sep 17 00:00:00 2001 From: Ignacio Galarza Date: Fri, 31 Jul 2009 15:22:02 -0400 Subject: 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. --- client/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client') diff --git a/client/Makefile.am b/client/Makefile.am index 672bb2e0c47..e77d294b0ac 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -57,7 +57,7 @@ strings_src=decimal.c # Fix for mit-threads DEFS = -DUNDEF_THREADS_HACK \ -DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \ - -DDATADIR="\"$(localstatedir)\"" + -DMYSQL_DATADIR="\"$(localstatedir)\"" EXTRA_DIST = get_password.c CMakeLists.txt echo.c -- cgit v1.2.1