diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2019-02-12 12:13:14 +1100 |
|---|---|---|
| committer | Axel Schwenke <axel@mariadb.com> | 2019-06-14 15:41:28 +0200 |
| commit | 6e5c24663983a9d12e812af22414d01de32a6728 (patch) | |
| tree | 763d5f2735d902d1658d53b7609fe93873c48654 /support-files | |
| parent | 91f1694836b65afd7fe2f4a669106e51ee47612c (diff) | |
| download | mariadb-git-6e5c24663983a9d12e812af22414d01de32a6728.tar.gz | |
MDEV-11670: ensure sysconfdir/sysconf2dir are not blank for mariadb@.service
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 43ab5787ceb..b04df4cd87e 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -90,8 +90,18 @@ IF(UNIX) SET(scriptdir ${INSTALL_SCRIPTDIRABS}) SET(libexecdir ${INSTALL_SBINDIRABS}) SET(pkgdatadir ${INSTALL_MYSQLSHAREDIRABS}) - SET(sysconfdir ${INSTALL_SYSCONFDIR}) - SET(sysconf2dir ${INSTALL_SYSCONF2DIR}) + IF(INSTALL_SYSCONFDIR) + 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 ${CMAKE_CURRENT_BINARY_DIR}/mysql.server @ONLY) INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server |