hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä 2019-06-12 18:15:37 +03:00
commit 10272ce633
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -241,9 +241,12 @@ install_file(${CMAKE_SOURCE_DIR}/etc/logrotate.d/maxscale_logrotate core)
install_header(${CMAKE_SOURCE_DIR}/COPYRIGHT devel)
install_header(${CMAKE_SOURCE_DIR}/LICENSE.TXT devel)
# Install startup scripts and ldconfig files
# Install startup scripts and other system configuration files
if(WITH_SCRIPTS)
include(cmake/init_scripts.cmake)
# Prevents prelink from corrupting maxctrl
install_custom_file(etc/prelink.conf.d/maxscale.conf /etc/prelink.conf.d/ core)
endif()
if(PACKAGE)

1
etc/prelink.conf.d/maxscale.conf Normal file
View File

@ -0,0 +1 @@
-b /usr/bin/maxctrl