--- libmariadb/CMakeLists.txt.orig	2016-04-12 12:34:11.000000000 +0200
+++ libmariadb/CMakeLists.txt	2016-05-31 22:48:06.757700300 +0200
@@ -1,7 +1,7 @@
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${ZLIB_INC}
                     ${CMAKE_SOURCE_DIR}/libmariadb)
-					
+
 ADD_DEFINITIONS(-D ENABLED_LOCAL_INFILE)
 ADD_DEFINITIONS(-D HAVE_COMPRESS)
 ADD_DEFINITIONS(-D LIBMARIADB)
@@ -239,15 +239,15 @@
 
 FILE(WRITE ${EXPORT_FILE} ${EXPORT_CONTENT})
 
-SET(LIBMARIADB_SOURCES 
-array.c 
+SET(LIBMARIADB_SOURCES
+array.c
 ma_dyncol.c
-bchange.c 
-bmove.c 
-bmove_upp.c 
+bchange.c
+bmove.c
+bmove_upp.c
 my_charset.c
 hash.c
-violite.c 
+violite.c
 net.c
 charset.c
 ma_time.c
@@ -257,27 +257,27 @@
 my_vsnprintf.c
 errors.c
 getopt1.c
-getopt.c 
+getopt.c
 int2str.c
 is_prefix.c
 libmariadb.c
 list.c
 llstr.c
-longlong2str.c 
-mf_dirname.c 
-mf_fn_ext.c 
+longlong2str.c
+mf_dirname.c
+mf_fn_ext.c
 mf_format.c
-mf_loadpath.c 
-mf_pack.c 
+mf_loadpath.c
+mf_pack.c
 mf_path.c
 mf_unixpath.c
 mf_wcomp.c
-mulalloc.c 
+mulalloc.c
 my_alloc.c
 my_compress.c
 my_context.c
 my_div.c
-my_error.c 
+my_error.c
 my_fopen.c
 my_fstream.c
 my_getwd.c
@@ -288,7 +288,7 @@
 my_net.c
 my_once.c
 my_open.c
-my_port.c 
+my_port.c
 my_pthread.c
 my_read.c
 my_realloc.c
@@ -298,10 +298,10 @@
 my_thr_init.c
 my_write.c
 mysql_async.c
-password.c 
+password.c
 str2int.c
 strcend.c
-strcont.c 
+strcont.c
 strend.c
 strfill.c
 string.c
@@ -310,7 +310,7 @@
 strmov.c
 strnmov.c
 strtoll.c
-strtoull.c 
+strtoull.c
 strxmov.c
 strxnmov.c
 thr_mutex.c
@@ -335,7 +335,7 @@
   LINK_LIBRARIES(${ZLIB_LIBRARY})
 ELSE()
   SET(ZLIB_SOURCES
-    ../zlib/adler32.c 
+    ../zlib/adler32.c
     ../zlib/compress.c
     ../zlib/crc32.c
     ../zlib/deflate.c
@@ -356,7 +356,7 @@
 ENDIF()
 
 IF(WIN32)
-  SET_VERSION_INFO("TARGET:libmariadb"
+  SET_VERSION_INFO("TARGET:mariadb"
                    "FILE_TYPE:VFT_DLL"
                    "SOURCE_FILE:libmariadb/libmariadb.c"
                    "ORIGINAL_FILE_NAME:libmariadb.dll"
@@ -368,7 +368,7 @@
                    "FILE_DESCRIPTION:Static lib for client/server communication")
 ENDIF()
 
-# CREATE OBJECT LIBRARY 
+# CREATE OBJECT LIBRARY
 ADD_LIBRARY(mariadb_obj OBJECT ${LIBMARIADB_SOURCES})
 IF(UNIX)
   SET_TARGET_PROPERTIES(mariadb_obj PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
@@ -384,23 +384,24 @@
 ADD_LIBRARY(mariadbclient STATIC ${mariadbclient_RC} $<TARGET_OBJECTS:mariadb_obj> ${EMPTY_FILE} ${EXPORT_LINK})
 TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS})
 
-ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} $<TARGET_OBJECTS:mariadb_obj> ${EMPTY_FILE} ${EXPORT_LINK})
-TARGET_LINK_LIBRARIES(libmariadb ${SYSTEM_LIBS})
+ADD_LIBRARY(mariadb SHARED ${libmariadb_RC} ${LIBMARIADB_SOURCES} ${EMPTY_FILE})
+TARGET_LINK_LIBRARIES(mariadb ${SYSTEM_LIBS})
 IF(UNIX)
-  SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
+  SET_TARGET_PROPERTIES(mariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
 ENDIF()
-SIGN_TARGET(libmariadb)
+SIGN_TARGET(mariadb)
 
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined")
-  TARGET_LINK_LIBRARIES (libmariadb "-Wl,--version-script=${EXPORT_FILE}")
+  TARGET_LINK_LIBRARIES (mariadb "-Wl,--no-undefined")
+  TARGET_LINK_LIBRARIES (mariadb "-Wl,--version-script=${EXPORT_FILE}")
   TARGET_LINK_LIBRARIES (mariadbclient "-Wl,--no-undefined")
   TARGET_LINK_LIBRARIES (mariadbclient "-Wl,--version-script=${EXPORT_FILE}")
 ENDIF()
 
-SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "")
+# for consistency with previous version
+#SET_TARGET_PROPERTIES(mariadb PROPERTIES PREFIX "")
 
-SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION 
+SET_TARGET_PROPERTIES(mariadb PROPERTIES VERSION
    ${CPACK_PACKAGE_VERSION_MAJOR}
    SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
 
@@ -413,24 +414,24 @@
 # There are still several projects which don't make use
 # of the config program. To make sure these programs can
 # use mariadb client library we provide libmysql symlinks
-IF(NOT WIN32 AND WITH_MYSQLCOMPAT)
-  SET(INSTALL_PATH ${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR})
-  create_symlink(libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_PATH})
-  create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} libmariadb ${INSTALL_PATH})
-  create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_PATH})
-  create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_PATH})
+IF(WITH_MYSQLCOMPAT)
+  SET(INSTALL_PATH ${LIB_INSTALL_DIR})
+  create_symlink(libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX} mariadb ${BIN_INSTALL_DIR})
+  create_symlink(libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX} mariadb ${BIN_INSTALL_DIR})
+  create_symlink(libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${LIB_INSTALL_DIR})
+  create_symlink(libmysqlclient_r${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${LIB_INSTALL_DIR})
 ENDIF()
 
 
 INSTALL(TARGETS
-          libmariadb mariadbclient
-          RUNTIME DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}"
-          LIBRARY DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}"
-          ARCHIVE DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}")
+          mariadb mariadbclient
+          RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
+          LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
+          ARCHIVE DESTINATION "${LIB_INSTALL_DIR}")
 
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/
         DESTINATION ${INCLUDE_INSTALL_DIR}/${SUFFIX_INSTALL_DIR})
-INSTALL(FILES 
+INSTALL(FILES
    ${CMAKE_BINARY_DIR}/include/my_config.h
    ${CMAKE_BINARY_DIR}/include/mysql_version.h
    DESTINATION ${INCLUDE_INSTALL_DIR}/${SUFFIX_INSTALL_DIR})