CONC-545 Connector/ODBC libraries go to the wrong directories

enabled build with OpenSSL by default on UNIX
CONC-545 Connector/ODBC libraries go to the wrong directories
added deb and rpm variables to set the layout accordingly
added properly configured layout for rpm packages
added deb paths to layout
added correct debian installation paths

CMakeLists.txt

@@ -104,6 +104,9 @@ ELSE()
   MESSAGE(STATUS "Authentication Plugins installation dir: ${INSTALL_PLUGINDIR}")
 ENDIF()
 
+IF(UNIX AND NOT WITH_SSL)
+  SET(WITH_SSL "OPENSSL")
+ENDIF()
 IF(WIN32 OR WITH_OPENSSL OR "${WITH_SSL}" STREQUAL  "OPENSSL")
   IF(WITH_OPENSSL OR "${WITH_SSL}" STREQUAL  "OPENSSL")
     FIND_PACKAGE(OpenSSL)

cmake/install.cmake

@@ -1,4 +1,4 @@
-#
+
 #  Copyright (C) 2013-2016 MariaDB Corporation AB
 #
 #  Redistribution and use is allowed according to the terms of the New
@@ -23,21 +23,30 @@
 # INSTALL_PLUGINDIR location of plugins
 # INSTALL_DOCDIR    location of docs
 # INSTALL_LICENSEDIR location of license
+#
+INCLUDE(GNUInstallDirs)
+SET(CMAKE_INSTALL_PREFIX "/usr")
+#
+IF(DEB)
+  SET(INSTALL_LAYOUT "DEB")
+ENDIF()
+
+IF(RPM)
+  SET(INSTALL_LAYOUT "RPM")
+ENDIF()
 
 IF(NOT INSTALL_LAYOUT)
   SET(INSTALL_LAYOUT "DEFAULT")
+  SET(CMAKE_INSTALL_PREFIX "/usr/local")
 ENDIF()
 
 SET(INSTALL_LAYOUT ${INSTALL_LAYOUT} CACHE
   STRING "Installation layout. Currently supported options are DEFAULT (tar.gz and zip), RPM and DEB")
 
+
 # On Windows we only provide zip and .msi. Latter one uses a different packager.
 IF(UNIX)
-  IF(INSTALL_LAYOUT MATCHES "RPM")
-    SET(libmariadb_prefix "/usr")
-  ELSEIF(INSTALL_LAYOUT MATCHES "DEFAULT|DEB")
-    SET(libmariadb_prefix ${CMAKE_INSTALL_PREFIX})
-  ENDIF()
+  SET(libmariadb_prefix ${CMAKE_INSTALL_PREFIX})
 ENDIF()
 
 IF(CMAKE_DEFAULT_PREFIX_INITIALIZED_BY_DEFAULT)
@@ -61,7 +70,6 @@ ENDIF()
 #
 # DEFAULT layout
 #
-
 SET(INSTALL_BINDIR_DEFAULT "bin")
 SET(INSTALL_LIBDIR_DEFAULT "${INSTALL_LIB_SUFFIX}/mariadb")
 SET(INSTALL_PCDIR_DEFAULT "${INSTALL_LIB_SUFFIX}/pkgconfig")
@@ -70,41 +78,37 @@ SET(INSTALL_DOCDIR_DEFAULT "docs")
 SET(INSTALL_LICENSEDIR_DEFAULT ${INSTALL_DOCDIR_DEFAULT})
 IF(NOT IS_SUBPROJECT)
   SET(INSTALL_PLUGINDIR_DEFAULT "lib/mariadb/plugin")
-ELSE()
 ENDIF()
 SET(LIBMARIADB_STATIC_DEFAULT "mariadbclient")
+
 #
 # RPM layout
 #
-SET(INSTALL_BINDIR_RPM "bin")
-IF((CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-  SET(INSTALL_LIBDIR_RPM "lib64/mariadb")
-  SET(INSTALL_PCDIR_RPM "lib64/pkgconfig")
-  SET(INSTALL_PLUGINDIR_RPM "lib64/mariadb/plugin")
-ELSE()
-  SET(INSTALL_LIBDIR_RPM "lib/mariadb")
-  SET(INSTALL_PCDIR_RPM "lib/pkgconfig")
-  SET(INSTALL_PLUGINDIR_RPM "lib/mariadb/plugin")
-ENDIF()
-SET(INSTALL_INCLUDEDIR_RPM "include")
-SET(INSTALL_DOCDIR_RPM "docs")
+SET(INSTALL_BINDIR_RPM "${CMAKE_INSTALL_BINDIR}")
+SET(INSTALL_LIBDIR_RPM "${CMAKE_INSTALL_LIBDIR}/mariadb")
+SET(INSTALL_PCDIR_RPM "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+SET(INSTALL_PLUGINDIR_RPM "${CMAKE_INSTALL_LIBDIR}/mariadb/plugin")
+SET(INSTALL_INCLUDEDIR_RPM "${CMAKE_INSTALL_INCLUDEDIR}/mariadb")
+SET(INSTALL_DOCDIR_RPM "${CMAKE_INSTALL_DOCDIR}")
+SET(INSTALL_LICENSEDIR_RPM "${INSTALL_DOCDIR_RPM}")
 SET(LIBMARIADB_STATIC_RPM "mariadbclient")
 
 #
 # DEB layout
 #
-SET(INSTALL_BINDIR_DEB "bin")
-SET(INSTALL_LIBDIR_DEB "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
-SET(INSTALL_PCDIR_DEB "lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig")
+SET(INSTALL_BINDIR_DEB "${CMAKE_INSTALL_BINDIR}")
+SET(INSTALL_LIBDIR_DEB "${CMAKE_INSTALL_LIBDIR}/${CMAKE_LIBRARY_ARCHITECTURE}")
+SET(INSTALL_PCDIR_DEB "${INSTALL_LIBDIR_DEB}/pkgconfig")
 SET(INSTALL_PLUGINDIR_DEB "${INSTALL_LIBDIR_DEB}/libmariadb${CPACK_PACKAGE_VERSION_MAJOR}/plugin")
-SET(INSTALL_INCLUDEDIR_DEB "include/mariadb")
+SET(INSTALL_INCLUDEDIR_DEB "${CMAKE_INSTALL_INCLUDEDIR}/mariadb")
+SET(INSTALL_DOCDIR_DEB "${CMAKE_INSTALL_DOCDIR}")
+SET(INSTALL_LICENSEDIR_DEB "${INSTALL_DOCDIR_DEB}")
 SET(LIBMARIADB_STATIC_DEB "mariadb")
 
 IF(INSTALL_LAYOUT MATCHES "DEB")
   SET(INSTALL_PLUGINDIR_CLIENT ${INSTALL_PLUGINDIR_DEB})
 ENDIF()
 
-
 #
 # Overwrite defaults
 #