more changes to man page handling

* move them from ManPagesX component to X (works better for plugins),
  but keep ManPagesDevelopment as C/C is using it
* move backup manpages to Backup
* move plugin manpages (s3, rocksdb) to plugins

.gitignore

@@ -239,6 +239,7 @@ storage/perfschema/pfs_config.h
 storage/rocksdb/ldb
 storage/rocksdb/myrocks_hotbackup
 storage/rocksdb/mysql_ldb
+storage/rocksdb/mysql_ldb.1
 storage/rocksdb/rdb_source_revision.h
 storage/rocksdb/sst_dump
 strings/conf_to_src
@@ -579,7 +580,6 @@ man/mysql_embedded.1
 man/mysql_find_rows.1
 man/mysql_fix_extensions.1
 man/mysql_install_db.1
-man/mysql_ldb.1
 man/mysql_plugin.1
 man/mysql_secure_installation.1
 man/mysql_setpermission.1

cmake/cpack_rpm.cmake

@@ -10,16 +10,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
 SET(CPACK_RPM_COMPONENT_INSTALL ON)
 
 SET(CPACK_COMPONENT_SERVER_GROUP "server")
-SET(CPACK_COMPONENT_MANPAGESSERVER_GROUP "server")
 SET(CPACK_COMPONENT_INIFILES_GROUP "server")
 SET(CPACK_COMPONENT_SERVER_SCRIPTS_GROUP "server")
 SET(CPACK_COMPONENT_SUPPORTFILES_GROUP "server")
 SET(CPACK_COMPONENT_DEVELOPMENT_GROUP "devel")
 SET(CPACK_COMPONENT_MANPAGESDEVELOPMENT_GROUP "devel")
 SET(CPACK_COMPONENT_TEST_GROUP "test")
-SET(CPACK_COMPONENT_MANPAGESTEST_GROUP "test")
 SET(CPACK_COMPONENT_CLIENT_GROUP "client")
-SET(CPACK_COMPONENT_MANPAGESCLIENT_GROUP "client")
 SET(CPACK_COMPONENT_README_GROUP "server")
 SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "shared")
 SET(CPACK_COMPONENT_COMMON_GROUP "common")
@@ -27,11 +24,9 @@ SET(CPACK_COMPONENT_CLIENTPLUGINS_GROUP "common")
 SET(CPACK_COMPONENT_COMPAT_GROUP "compat")
 SET(CPACK_COMPONENT_BACKUP_GROUP "backup")
 
-SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts
+SET(CPACK_COMPONENTS_ALL Server IniFiles Server_Scripts SupportFiles
-                         SupportFiles Development ManPagesDevelopment
+                         Development ManPagesDevelopment Readme Test Common
-                         ManPagesTest Readme ManPagesClient Test
+                         Client SharedLibraries ClientPlugins Backup
-                         Common Client SharedLibraries ClientPlugins
-                         Backup
 )
 
 SET(CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME})

cmake/install_macros.cmake

@@ -57,8 +57,7 @@ FUNCTION(INSTALL_MANPAGES COMP)
     IF(NOT ${n})
       MESSAGE(FATAL_ERROR "Wrong filename in INSTALL_MANPAGE(${f})")
     ENDIF()
-    INSTALL(FILES ${f} DESTINATION ${INSTALL_MANDIR}/man${n}
+    INSTALL(FILES ${f} DESTINATION ${INSTALL_MANDIR}/man${n} COMPONENT ${COMP})
-            COMPONENT ManPages${COMP})
 
     STRING(REGEX REPLACE "\\.${n}$" "" f ${f})
     LIST(FIND MARIADB_SYMLINK_FROMS ${f} i)
@@ -67,7 +66,7 @@ FUNCTION(INSTALL_MANPAGES COMP)
       SET(dst "${CMAKE_CURRENT_BINARY_DIR}/${s}.${n}")
       FILE(WRITE ${dst} ".so man${n}/${f}.${n}")
       INSTALL(FILES ${dst} DESTINATION ${INSTALL_MANDIR}/man${n}
-              COMPONENT ManPages${COMP})
+              COMPONENT ${COMP})
     ENDIF()
   ENDFOREACH()
 ENDFUNCTION()

man/CMakeLists.txt

@@ -16,11 +16,11 @@
 IF(NOT WITHOUT_SERVER)
   INSTALL_MANPAGES(Server
     innochecksum.1 myisam_ftdump.1 myisamchk.1 aria_chk.1 aria_dump_log.1
-    aria_ftdump.1 aria_pack.1 aria_read_log.1 aria_s3_copy.1 myisamlog.1
+    aria_ftdump.1 aria_pack.1 aria_read_log.1 myisamlog.1
     myisampack.1 mysql.server.1 mariadb-conv.1 mariadb-fix-extensions.1
     mariadb-install-db.1 mariadb-upgrade.1 mariadbd-multi.1 mariadbd-safe.1
-    resolveip.1 mariadb-service-convert.1 mariadbd-safe-helper.1 mariadb-ldb.1
+    resolveip.1 mariadb-service-convert.1 mariadbd-safe-helper.1 mariadbd.8)
-    myrocks_hotbackup.1 mbstream.1 mariadb-backup.1 mariadbd.8)
+  INSTALL_MANPAGES(Backup mbstream.1 mariadb-backup.1)
   IF(WITH_WSREP)
     INSTALL_MANPAGES(Server
       wsrep_sst_rsync.1 wsrep_sst_common.1 wsrep_sst_mariabackup.1

storage/maria/CMakeLists.txt

@@ -135,4 +135,5 @@ IF(TARGET s3)
   TARGET_LINK_LIBRARIES(aria_s3_copy aria myisam mysys mysys_ssl ${CURL_LIBRARIES} ${ZLIB_LIBRARY})
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libmarias3)
   ADD_DEFINITIONS(-DWITH_S3_STORAGE_ENGINE)
+  INSTALL_MANPAGES(s3-engine aria_s3_copy.1)
 ENDIF()

storage/rocksdb/CMakeLists.txt

@@ -155,6 +155,8 @@ IF(NOT TARGET rocksdb)
   RETURN()
 ENDIF()
 
+INSTALL_MANPAGES(rocksdb-engine mariadb-ldb.1 myrocks_hotbackup.1)
+
 CHECK_CXX_SOURCE_COMPILES("
 #if defined(_MSC_VER) && !defined(__thread)
 #define __thread __declspec(thread)