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.

---
 sql/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/Makefile.am')

diff --git a/sql/Makefile.am b/sql/Makefile.am
index 2a0d59d0ab9..e4f339384c9 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -114,7 +114,7 @@ mysql_tzinfo_to_sql_LDADD =  @MYSQLD_EXTRA_LDFLAGS@ $(LDADD) $(CXXLDFLAGS)
 
 DEFS =			-DMYSQL_SERVER \
 			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
-			-DDATADIR="\"$(MYSQLDATAdir)\"" \
+			-DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \
 			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
 			@DEFS@
 
-- 
cgit v1.2.1