VladPolskiy/MariaDB
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-21 02:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

MDEV-11670: ensure sysconfdir/sysconf2dir are not blank for mariadb@.service

Browse Source
This commit is contained in:
Daniel Black
2019-02-12 12:13:14 +11:00
committed by Axel Schwenke
parent 91f1694836
commit 6e5c246639
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
support-files/CMakeLists.txt
View File

@ -90,8 +90,18 @@ IF(UNIX)
SET(scriptdir ${INSTALL_SCRIPTDIRABS}) SET(scriptdir ${INSTALL_SCRIPTDIRABS})
SET(libexecdir ${INSTALL_SBINDIRABS}) SET(libexecdir ${INSTALL_SBINDIRABS})
SET(pkgdatadir ${INSTALL_MYSQLSHAREDIRABS}) SET(pkgdatadir ${INSTALL_MYSQLSHAREDIRABS})
SET(sysconfdir ${INSTALL_SYSCONFDIR}) IF(INSTALL_SYSCONFDIR)
SET(sysconf2dir ${INSTALL_SYSCONF2DIR}) SET(sysconfdir ${INSTALL_SYSCONFDIR})
ELSEIF(DEFAULT_SYSCONFDIR)
SET(sysconfdir ${DEFAULT_SYSCONFDIR})
ELSE()
SET(sysconfdir "/etc")
ENDIF()
IF(INSTALL_SYSCONFDIR)
SET(sysconf2dir ${INSTALL_SYSCONF2DIR})
ELSE()
SET(sysconf2dir "${sysconfdir}/mysql")
ENDIF()
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql.server.sh CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql.server.sh
${CMAKE_CURRENT_BINARY_DIR}/mysql.server @ONLY) ${CMAKE_CURRENT_BINARY_DIR}/mysql.server @ONLY)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server