Blob Blame Raw
diff -rup 1/mariadb_client-2.0.0-src/CMakeLists.txt 2/mariadb_client-2.0.0-src/CMakeLists.txt
--- 1/mariadb_client-2.0.0-src/CMakeLists.txt	2014-09-09 18:13:23.456049673 +0200
+++ 2/mariadb_client-2.0.0-src/CMakeLists.txt	2014-09-09 18:34:34.016628405 +0200
@@ -102,7 +102,7 @@ INCLUDE(cmake/SearchLibrary.cmake)
 IF(WITH_EXTERNAL_ZLIB)
   FIND_PACKAGE(ZLIB QUIET)
   IF(${ZLIB_FOUND})
-    SET(LIBZ "-lz")
+    SET(LIBZ "z")
   ENDIF()
 ENDIF()
 
diff -rup 1/mariadb_client-2.0.0-src/libmariadb/CMakeLists.txt 2/mariadb_client-2.0.0-src/libmariadb/CMakeLists.txt
--- 1/mariadb_client-2.0.0-src/libmariadb/CMakeLists.txt	2014-09-09 18:13:23.440049728 +0200
+++ 2/mariadb_client-2.0.0-src/libmariadb/CMakeLists.txt	2014-09-09 18:03:26.991125238 +0200
@@ -210,15 +210,15 @@ ENDIF()
 
 INSTALL(TARGETS
           libmariadb mariadbclient
-          RUNTIME DESTINATION "lib/mariadb"
-          LIBRARY DESTINATION "lib/mariadb"
-          ARCHIVE DESTINATION "lib/mariadb")
+          RUNTIME DESTINATION "${LIB_INSTALL_DIR}/mariadb"
+          LIBRARY DESTINATION "${LIB_INSTALL_DIR}/mariadb"
+          ARCHIVE DESTINATION "${LIB_INSTALL_DIR}/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_INSTALL_DIR}/mariadb)
 ENDIF()
 
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/
diff -rup 1/mariadb_client-2.0.0-src/mariadb_config/mariadb_config.c.in 2/mariadb_client-2.0.0-src/mariadb_config/mariadb_config.c.in
--- 1/mariadb_client-2.0.0-src/mariadb_config/mariadb_config.c.in	2014-09-09 18:13:23.442049722 +0200
+++ 2/mariadb_client-2.0.0-src/mariadb_config/mariadb_config.c.in	2014-09-10 11:49:13.548395885 +0200
@@ -3,10 +3,10 @@
 #include <getopt.h>
 #include <stdio.h>
 
-#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/include/mariadb"
-#define LIBS    "-L@CMAKE_INSTALL_PREFIX@/lib/mariadb -lmariadb" \
+#define INCLUDE "-I@INCLUDE_INSTALL_DIR@/mariadb"
+#define LIBS    "-L@LIB_INSTALL_DIR@/mariadb -lmariadb" \
                 "@extra_dynamic_LDFLAGS@"
-#define CFLAGS  INCLUDE "@CMAKE_C_FLAGS@"
+#define CFLAGS  INCLUDE " @CMAKE_C_FLAGS@"
 #define VERSION "@MYSQL_CLIENT_VERSION@"
 #define SOCKET  "@MYSQL_UNIX_ADDR@"
 #define PORT "@MYSQL_PORT@"