diff options
| -rwxr-xr-x | CMakeLists.txt | 7 | ||||
| -rwxr-xr-x | cmake/install_layout.cmake | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dd4f4a80516..889dc463769 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -189,8 +189,11 @@ ELSE() ENDIF() SET(DEFAULT_BASEDIR "${DEFAULT_MYSQL_HOME}") -SET(MYSQL_DATADIR "${DEFAULT_MYSQL_HOME}/${INSTALL_MYSQLDATADIR}" CACHE PATH - "default MySQL data directory") +IF(INSTALL_MYSQLDATADIR MATCHES "^/.*") + SET(MYSQL_DATADIR ${INSTALL_MYSQLDATADIR} CACHE PATH "default MySQL data directory") +ELSE() + SET(MYSQL_DATADIR "${DEFAULT_MYSQL_HOME}/${INSTALL_MYSQLDATADIR}" CACHE PATH "default MySQL data directory") +ENDIF() SET(DEFAULT_CHARSET_HOME "${DEFAULT_MYSQL_HOME}") SET(PLUGINDIR "${DEFAULT_MYSQL_HOME}/${INSTALL_PLUGINDIR}") IF(SYSCONFDIR) diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index cb7314d5085..619f40c5774 100755 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -125,7 +125,7 @@ SET(INSTALL_SHAREDIR_RPM "share") #SET(INSTALL_DOCREADMEDIR_RPM "${INSTALL_DOCDIR_RPM}") SET(INSTALL_INFODIR_RPM "${INSTALL_SHAREDIR_RPM}/info") SET(INSTALL_MANDIR_RPM "${INSTALL_SHAREDIR_RPM}/man") -SET(INSTALL_MYSQLDATADIR_RPM "var") +SET(INSTALL_MYSQLDATADIR_RPM "/var/lib/mysql") SET(INSTALL_MYSQLSHAREDIR_RPM "${INSTALL_SHAREDIR_RPM}/mysql") SET(INSTALL_MYSQLTESTDIR_RPM "${INSTALL_SHAREDIR_RPM}/mysql-test") SET(INSTALL_PLUGINDIR_RPM "${INSTALL_LIBDIR_RPM}/mysql/plugin") @@ -167,7 +167,7 @@ SET(INSTALL_MYSQLTESTDIR_SVR4 "mysql-test") SET(INSTALL_SQLBENCHROOTDIR_SVR4 ".") SET(INSTALL_DOCREADMEDIR_SVR4 ".") SET(INSTALL_SUPPORTFILESDIR_SVR4 "support-files") -SET(MYSQL_DATADIR "/var/lib/mysql") +SET(INSTALL_MYSQLDATADIR_RPM "/var/lib/mysql") # Clear cached variables if install layout was changed IF(OLD_INSTALL_LAYOUT) |