diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2010-11-18 15:01:50 +0300 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2010-11-18 15:01:50 +0300 |
| commit | aab0c52976a9d647388525423f7c7e8d25ad4118 (patch) | |
| tree | 04b3b89fdd9cd8129c671253e6d65fe9be72ded2 /support-files | |
| parent | 3a669ed90641612beae8a23f5886f75484e72f76 (diff) | |
| parent | 94c79b37a0b9609841577c3620e4261141be342b (diff) | |
| download | mariadb-git-aab0c52976a9d647388525423f7c7e8d25ad4118.tar.gz | |
Manual-merge from 5.5-bugfixing.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 1 |
2 files changed, 9 insertions, 3 deletions
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index ef676c8ee2a..26aa7ad81ad 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -61,12 +61,17 @@ IF(UNIX) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) + IF(script MATCHES ".ini") + SET(comp IniFiles) + ELSE() + SET(comp Server_Scripts) + ENDIF() INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${script} - DESTINATION ${inst_location} + DESTINATION ${inst_location} COMPONENT ${comp} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ENDFOREACH() IF(INSTALL_SUPPORTFILESDIR) - INSTALL(FILES magic DESTINATION ${inst_location}) + INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) ENDIF() INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) @@ -83,7 +88,7 @@ IF(UNIX) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql.server.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.server @ONLY) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql.server - DESTINATION ${inst_location} + DESTINATION ${inst_location} COMPONENT SupportFiles PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ENDIF() diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 5c2ea2305d3..d49c3986945 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -335,6 +335,7 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/ %package -n MySQL-shared%{product_suffix} Summary: MySQL - Shared libraries Group: Applications/Databases +Provides: mysql-shared Obsoletes: MySQL-shared-community %description -n MySQL-shared%{product_suffix} |