diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2013-11-18 15:48:01 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2013-11-18 15:48:01 +0400 |
| commit | 160236f880e92d2872d95ce72aab144f08456bcc (patch) | |
| tree | 57d9acf78645df588d4415a175f56680c6784222 /support-files | |
| parent | 45f81d4dcfb1d24787af1a003a8cee073a8e09d0 (diff) | |
| download | mariadb-git-160236f880e92d2872d95ce72aab144f08456bcc.tar.gz | |
MDEV-5182 - build of 10.0.4/r3863 fails @ 'cmake' with
-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.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 1909c1760d9..ed29fa96a78 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -105,12 +105,15 @@ IF(UNIX) INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR} COMPONENT Common) - INSTALL(FILES rpm/client.cnf DESTINATION ${INSTALL_SYSCONF2DIR} - COMPONENT SharedLibraries) - INSTALL(FILES rpm/mysql-clients.cnf DESTINATION ${INSTALL_SYSCONF2DIR} - COMPONENT Client) - INSTALL(FILES rpm/server.cnf DESTINATION ${INSTALL_SYSCONF2DIR} - COMPONENT IniFiles) + + IF (INSTALL_SYSCONF2DIR) + INSTALL(FILES rpm/client.cnf DESTINATION ${INSTALL_SYSCONF2DIR} + COMPONENT SharedLibraries) + INSTALL(FILES rpm/mysql-clients.cnf DESTINATION ${INSTALL_SYSCONF2DIR} + COMPONENT Client) + INSTALL(FILES rpm/server.cnf DESTINATION ${INSTALL_SYSCONF2DIR} + COMPONENT IniFiles) + ENDIF() # This is for SuSE: INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink |