diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-06-10 16:26:13 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-06-12 01:17:57 +0200 |
| commit | 07d1c8567cbfe94398a9857c47fb9919cad42651 (patch) | |
| tree | bb7b6b4496f9919ed4fc0eda62252d567628daa3 /cmake | |
| parent | d3f4748254f96a2e9f30674ed7fcd40001f75b21 (diff) | |
| download | mariadb-git-07d1c8567cbfe94398a9857c47fb9919cad42651.tar.gz | |
post-fix for #1504
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/install_layout.cmake | 2 | ||||
| -rw-r--r-- | cmake/plugin.cmake | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 9e3549964e1..83cba054be6 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -175,7 +175,7 @@ SET(INSTALL_BINDIR_DEB "bin") SET(INSTALL_SBINDIR_DEB "sbin") SET(INSTALL_SCRIPTDIR_DEB "bin") SET(INSTALL_SYSCONFDIR_DEB "/etc") -SET(INSTALL_SYSCONF2DIR_DEB "/etc/mysql/conf.d") +SET(INSTALL_SYSCONF2DIR_DEB "/etc/mysql/mariadb.conf.d") # SET(INSTALL_LIBDIR_DEB "lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}") SET(INSTALL_PLUGINDIR_DEB "lib/mysql/plugin") diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index 7e9b80991ca..f2cba074397 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -252,7 +252,6 @@ MACRO(MYSQL_ADD_PLUGIN) SET(ARG_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${target}.cnf") FILE(WRITE ${ARG_CONFIG} "[mariadb]\nplugin-load-add=${ARG_MODULE_OUTPUT_NAME}.so\n") ENDIF() - INSTALL(FILES ${ARG_CONFIG} COMPONENT ${ARG_COMPONENT} DESTINATION ${INSTALL_SYSCONF2DIR}) SET(CPACK_RPM_${ARG_COMPONENT}_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*" PARENT_SCOPE) SET(CPACK_RPM_${ARG_COMPONENT}_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/plugin-postin.sh PARENT_SCOPE) SET(CPACK_RPM_${ARG_COMPONENT}_POST_TRANS_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/server-posttrans.sh PARENT_SCOPE) @@ -262,6 +261,9 @@ MACRO(MYSQL_ADD_PLUGIN) SET(ARG_COMPONENT Server) ENDIF() MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT ${ARG_COMPONENT}) + IF(ARG_CONFIG AND INSTALL_SYSCONF2DIR) + INSTALL(FILES ${ARG_CONFIG} COMPONENT ${ARG_COMPONENT} DESTINATION ${INSTALL_SYSCONF2DIR}) + ENDIF() ENDIF() GET_FILENAME_COMPONENT(subpath ${CMAKE_CURRENT_SOURCE_DIR} NAME) |