Commit aba006b7 authored by Jonathan Perkin's avatar Jonathan Perkin

Try to fix SVR4 packages.

parent 7107d012
...@@ -31,14 +31,12 @@ ELSE() ...@@ -31,14 +31,12 @@ ELSE()
SET(ini_file_extension "cnf") SET(ini_file_extension "cnf")
ENDIF() ENDIF()
IF(UNIX) # XXX: shouldn't we just have variables for all this stuff and centralise
IF(INSTALL_LAYOUT MATCHES "STANDALONE") # XXX: their configuration in install_layout.cmake?
SET(inst_location ${INSTALL_SUPPORTFILESDIR}) IF(WIN32)
ELSE()
SET(inst_location ${INSTALL_DOCREADMEDIR}) SET(inst_location ${INSTALL_DOCREADMEDIR})
ENDIF()
ELSE() ELSE()
SET(inst_location ${INSTALL_DOCREADMEDIR}) SET(inst_location ${INSTALL_SUPPORTFILESDIR})
ENDIF() ENDIF()
FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
...@@ -48,15 +46,14 @@ FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) ...@@ -48,15 +46,14 @@ FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
ENDFOREACH() ENDFOREACH()
IF(UNIX) IF(UNIX)
# XXX: again, used elsewhere (scripts/), should be standardised in
# XXX: install_layout.cmake
IF(INSTALL_LAYOUT MATCHES "STANDALONE") IF(INSTALL_LAYOUT MATCHES "STANDALONE")
SET(prefix ".") SET(prefix ".")
SET(inst_location ${INSTALL_SUPPORTFILESDIR})
ELSE() ELSE()
SET(prefix ${CMAKE_INSTALL_PREFIX}) SET(prefix ${CMAKE_INSTALL_PREFIX})
SET(inst_location ${INSTALL_MYSQLSHAREDIR})
ENDIF() ENDIF()
FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure
config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini) config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment