Merge branch '2.3' into 2.4

This commit is contained in:
Markus Mäkelä 2019-09-18 17:03:40 +03:00
commit 8dccae63dd
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
3 changed files with 5 additions and 1 deletions

View File

@ -9,6 +9,7 @@ In order to use the tarball, the following libraries are required:
- libcurl
- libaio
- OpenSSL
- gnutls
The tarball has been built with the assumption that it will be installed in `/usr/local`.
However, it is possible to install it in any directory, but in that case MariaDB MaxScale

View File

@ -5,7 +5,7 @@
set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
set(MAXSCALE_VERSION_MINOR "3" CACHE STRING "Minor version")
set(MAXSCALE_VERSION_PATCH "12" CACHE STRING "Patch version")
set(MAXSCALE_VERSION_PATCH "13" CACHE STRING "Patch version")
# This should only be incremented if a package is rebuilt
set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")

View File

@ -22,6 +22,9 @@ install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/cache/ma
install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/log/maxscale)
install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/run/maxscale)
install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/lib/maxscale)
install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/lib/maxscale/maxscale.cnf.d)
install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION etc/maxscale.modules.d)
install(FILES ${CMAKE_BINARY_DIR}/.cmake-tgz-workaround DESTINATION var/lib/plugin)
if(DISTRIB_SUFFIX)
set(CPACK_PACKAGE_FILE_NAME "maxscale-${MAXSCALE_VERSION}.${DISTRIB_SUFFIX}")