1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-5182 - build of 10.0.4/r3863 fails @ 'cmake' with

Browse Source 
-DINSTALL_SYSCONFDIR/-DDEFAULT_SYSCONFDIR specified

The reason for a bug is in support-files/CMakeLists.txt that tries to
install files in INSTALL_SYSCONF2DIR, without checking whether this
variable is actually defined. 

Normally INSTALL_SYSCONF2DIR is always defined if INSTALL_SYSCONFDIR is
defined, and support-files/CMakeLists.txt assumes that. But when one
specifies INSTALL_SYSCONFDIR manually on the command line, this
assumption might be broken.
This commit is contained in:
Sergey Vojtovich 2013-11-18 15:48:01 +04:00
parent 45f81d4dcf
commit 160236f880
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
support-files/CMakeLists.txt
View File

@ -105,12 +105,15 @@ IF(UNIX)
INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR} INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}
COMPONENT Common) COMPONENT Common)
INSTALL(FILES rpm/client.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
COMPONENT SharedLibraries) IF (INSTALL_SYSCONF2DIR)
INSTALL(FILES rpm/mysql-clients.cnf DESTINATION ${INSTALL_SYSCONF2DIR} INSTALL(FILES rpm/client.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
COMPONENT Client) COMPONENT SharedLibraries)
INSTALL(FILES rpm/server.cnf DESTINATION ${INSTALL_SYSCONF2DIR} INSTALL(FILES rpm/mysql-clients.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
COMPONENT IniFiles) COMPONENT Client)
INSTALL(FILES rpm/server.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
COMPONENT IniFiles)
ENDIF()
# This is for SuSE: # This is for SuSE:
INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink