diff options
| author | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-12-17 23:03:23 +0000 |
|---|---|---|
| committer | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-12-17 23:03:23 +0000 |
| commit | b1b89865c6ee1ccf919642aa4ea275f68866dae9 (patch) | |
| tree | 192446948076bb26fd1bdf0de884332a9dab6ca4 /support-files | |
| parent | a3cc81fa70e71dd9a40be3c5477eb7a6e8ec4974 (diff) | |
| download | mariadb-git-b1b89865c6ee1ccf919642aa4ea275f68866dae9.tar.gz | |
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.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 9 |
1 files changed, 1 insertions, 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 |