From 2b39e065d70078daa097a811c939003a071dcb70 Mon Sep 17 00:00:00 2001 From: Jonathan Perkin Date: Fri, 17 Dec 2010 23:03:23 +0000 Subject: [PATCH] bug#51264: MySQL.prefPane fails to run @prefix@ was erroneously set to '.' with the STANDALONE install layout, when it should instead be set to CMAKE_INSTALL_PREFIX, this was likely accidentally copied from scripts/CMakeLists.txt which has similar handling specifically for mysql_install_db.sh mysql.server init script can now find the install, assuming the defaults have been chosen. --- support-files/CMakeLists.txt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 2d1d1e83b8b..f8a65e75d4d 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -48,14 +48,7 @@ FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) ENDFOREACH() IF(UNIX) - # XXX: again, used elsewhere (scripts/), should be standardised in - # XXX: install_layout.cmake - IF(INSTALL_LAYOUT MATCHES "STANDALONE") - SET(prefix ".") - ELSE() - SET(prefix ${CMAKE_INSTALL_PREFIX}) - ENDIF() - + SET(prefix ${CMAKE_INSTALL_PREFIX}) FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh