From 09877515f22be7b4cbd0a96be4814f6024ad6ce3 Mon Sep 17 00:00:00 2001
From: Ignacio Galarza <iggy@mysql.com>
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.

---
 libmysql/Makefile.shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libmysql/Makefile.shared')

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)\"" \
-- 
cgit v1.2.1