commit cb83d8481dae40ecc0fbf7052b39aae00837c7f4
Author: Todd Rinaldo <toddr@cpanel.net>
Date:   Wed Oct 16 12:03:02 2013 +1100

    Fix cmake to honor lib64 destinations

diff --git a/SOURCES/mariadb-native-client/CMakeLists.txt b/SOURCES/mariadb-native-client/CMakeLists.txt
index cc991ee..1d3cc95 100644
--- a/SOURCES/mariadb-native-client/CMakeLists.txt
+++ b/SOURCES/mariadb-native-client/CMakeLists.txt
@@ -57,8 +57,13 @@ SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDBUG_OFF")
 SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF")
 SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDBUG_OFF")
 
+SET(LIB_DIR_SUFFIX "")
 IF(UNIX)
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFE_MUTEX")
+
+  IF("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64")
+    SET(LIB_DIR_SUFFIX "64")
+  ENDIF()
 ENDIF()
 
 IF(CMAKE_COMPILER_IS_GNUCC)
diff --git a/SOURCES/mariadb-native-client/libmariadb/CMakeLists.txt b/SOURCES/mariadb-native-client/libmariadb/CMakeLists.txt
index d0a261b..832f987 100644
--- a/SOURCES/mariadb-native-client/libmariadb/CMakeLists.txt
+++ b/SOURCES/mariadb-native-client/libmariadb/CMakeLists.txt
@@ -208,15 +208,15 @@ ENDIF()
 
 INSTALL(TARGETS
           libmariadb mariadbclient
-          RUNTIME DESTINATION "lib/mariadb"
-          LIBRARY DESTINATION "lib/mariadb"
-          ARCHIVE DESTINATION "lib/mariadb")
+          RUNTIME DESTINATION "lib@LIB_DIR_SUFFIX@/mariadb"
+          LIBRARY DESTINATION "lib@LIB_DIR_SUFFIX@/mariadb"
+          ARCHIVE DESTINATION "lib@LIB_DIR_SUFFIX@/mariadb")
 IF(NOT WIN32 AND WITH_MYSQLCOMPAT)
   INSTALL(FILES "${CMAKE_BINARY_DIR}/libmariadb/libmysql${CMAKE_SHARED_LIBRARY_SUFFIX}"
                 "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX}"
                 "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX}"
                 "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX}"
-                DESTINATION lib/mariadb)
+                DESTINATION lib@LIB_DIR_SUFFIX@/mariadb)
 ENDIF()
 
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/
diff --git a/SOURCES/mariadb-native-client/mariadb_config/mariadb_config.c.in b/SOURCES/mariadb-native-client/mariadb_config/mariadb_config.c.in
index ff7acf5..cd0d770 100644
--- a/SOURCES/mariadb-native-client/mariadb_config/mariadb_config.c.in
+++ b/SOURCES/mariadb-native-client/mariadb_config/mariadb_config.c.in
@@ -4,7 +4,7 @@
 #include <stdio.h>
 
 #define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/include/mariadb"
-#define LIBS    "-L@CMAKE_INSTALL_PREFIX@/lib/mariadb -lmariadb" \
+#define LIBS    "-L@CMAKE_INSTALL_PREFIX@/lib@LIB_DIR_SUFFIX@/mariadb -lmariadb" \
                 "@extra_dynamic_LDFLAGS@"
 #define CFLAGS  INCLUDE "@CMAKE_C_FLAGS@"
 #define VERSION "@MYSQL_CLIENT_VERSION@"