--- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -167,23 +167,13 @@ # i.e. makes access relative the current directory. This matches # the documentation, so better not change this. -IF(INSTALL_LAYOUT MATCHES "STANDALONE") - SET(prefix ".") - SET(bindir ${prefix}/${INSTALL_BINDIR}) - SET(sbindir ${prefix}/${INSTALL_SBINDIR}) - SET(scriptdir ${prefix}/${INSTALL_BINDIR}) - SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) - SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) - SET(localstatedir ${prefix}/data) -ELSE() - SET(prefix "${CMAKE_INSTALL_PREFIX}") - SET(bindir ${INSTALL_BINDIRABS}) - SET(sbindir ${INSTALL_SBINDIRABS}) - SET(scriptdir ${INSTALL_BINDIRABS}) - SET(libexecdir ${INSTALL_SBINDIRABS}) - SET(pkgdatadir ${INSTALL_MYSQLSHAREDIRABS}) - SET(localstatedir ${MYSQL_DATADIR}) -ENDIF() +SET(prefix "${CMAKE_INSTALL_PREFIX}") +SET(bindir ${prefix}/${INSTALL_BINDIR}) +SET(sbindir ${prefix}/${INSTALL_SBINDIR}) +SET(scriptdir ${prefix}/${INSTALL_BINDIR}) +SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) +SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) +SET(localstatedir ${MYSQL_DATADIR}) IF(UNIX) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh