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

…service
MariaDB · Jun 14, 2019 · 6e5c246 · GeoffMonteeMariaDB · Jun 14, 2019 · 6e5c246
1 parent 91f1694
commit 6e5c246
Showing 1 changed file with 12 additions and 2 deletions.
diff --git 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