man pages: mariadb* are primary pages, mysql* are generated

.gitignore

@@ -569,39 +569,39 @@ extra/mariadb-waitpid
 libmysqld/examples/mariadb-client-test-embedded
 libmysqld/examples/mariadb-embedded
 libmysqld/examples/mariadb-test-embedded
-man/mariadb.1
-man/mariadb-access.1
-man/mariadb-admin.1
-man/mariadb-backup.1
-man/mariadb-binlog.1
-man/mariadb-check.1
-man/mariadb-client-test.1
-man/mariadb-client-test-embedded.1
-man/mariadb_config.1
-man/mariadb-convert-table-format.1
-man/mariadbd.8
-man/mariadbd-multi.1
-man/mariadbd-safe.1
-man/mariadbd-safe-helper.1
-man/mariadb-dump.1
-man/mariadb-dumpslow.1
-man/mariadb-embedded.1
-man/mariadb-find-rows.1
-man/mariadb-fix-extensions.1
-man/mariadb-hotcopy.1
-man/mariadb-import.1
-man/mariadb-install-db.1
-man/mariadb-ldb.1
-man/mariadb-plugin.1
-man/mariadb-secure-installation.1
-man/mariadb-setpermission.1
-man/mariadb-show.1
-man/mariadb-slap.1
-man/mariadb-test.1
-man/mariadb-test-embedded.1
-man/mariadb-tzinfo-to-sql.1
-man/mariadb-upgrade.1
-man/mariadb-waitpid.1
+man/mariabackup.1
+man/mysql.1
+man/mysql_client_test.1
+man/mysql_client_test_embedded.1
+man/mysql_config.1
+man/mysql_convert_table_format.1
+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
+man/mysql_tzinfo_to_sql.1
+man/mysql_upgrade.1
+man/mysql_waitpid.1
+man/mysqlaccess.1
+man/mysqladmin.1
+man/mysqlbinlog.1
+man/mysqlcheck.1
+man/mysqld.8
+man/mysqld_multi.1
+man/mysqld_safe.1
+man/mysqld_safe_helper.1
+man/mysqldump.1
+man/mysqldumpslow.1
+man/mysqlhotcopy.1
+man/mysqlimport.1
+man/mysqlshow.1
+man/mysqlslap.1
+man/mysqltest.1
+man/mysqltest_embedded.1
 scripts/mariadb-access
 scripts/mariadb-convert-table-format
 scripts/mariadbd-multi

man/CMakeLists.txt

@@ -53,11 +53,11 @@ INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPage
 INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
 
 macro(MARIADB_SYMLINK_MANPAGE)
-  list(LENGTH MARIADB_SYMLINK_TOS _len)
+  list(LENGTH MARIADB_SYMLINK_FROMS _len)
   math(EXPR _listlen "${_len}-1")
 
   foreach(_index RANGE ${_listlen})
-    list(GET MARIADB_SYMLINK_TOS ${_index} _name)
+    list(GET MARIADB_SYMLINK_FROMS ${_index} _name)
 
     set(_manname "${_name}")
     list(FIND MAN1_SERVER ${_manname}.1 _iman1server)
@@ -67,31 +67,31 @@ macro(MARIADB_SYMLINK_MANPAGE)
     list(FIND MAN1_TEST ${_manname}.1 _iman1test)
 
     if (${_iman1client} GREATER -1)
-      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesClient)
+      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 Client)
     endif()
     if (${_iman1devel} GREATER -1)
-      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesDevelopment)
+      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 Development)
     endif()
     if (${_iman1test} GREATER -1)
-      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesTest)
+      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 Test)
     endif()
     if (WITHOUT_SERVER)
 	    continue()
     endif()
     if (${_iman1server} GREATER -1)
-      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 "man1" ManPagesServer)
+      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 1 Server)
     endif()
     if (${_iman8server} GREATER -1)
-      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 8 "man8" ManPagesServer)
+      MARIADB_SYMLINK_MANPAGE_CREATE(${_manname} ${_index} 8 Server)
     endif()
   endforeach(_index)
 endmacro(MARIADB_SYMLINK_MANPAGE)
 
-macro(MARIADB_SYMLINK_MANPAGE_CREATE mysqlname index mannr dir comp)
-  LIST(GET MARIADB_SYMLINK_FROMS ${index} _mariadbname)
+macro(MARIADB_SYMLINK_MANPAGE_CREATE mysqlname index mannr comp)
+  LIST(GET MARIADB_SYMLINK_TOS ${index} _mariadbname)
   SET(dest "${CMAKE_CURRENT_BINARY_DIR}/${_mariadbname}.${mannr}")
-  FILE(WRITE ${dest} ".so ${dir}/${mysqlname}.${mannr}")
-  INSTALL(FILES ${dest} DESTINATION ${INSTALL_MANDIR}/${dir} COMPONENT ${comp})
+  FILE(WRITE ${dest} ".so man${mannr}/${mysqlname}.${mannr}")
+  INSTALL(FILES ${dest} DESTINATION ${INSTALL_MANDIR}/man${mannr} COMPONENT ManPages${comp})
 endmacro(MARIADB_SYMLINK_MANPAGE_CREATE)
 
 MARIADB_SYMLINK_MANPAGE()

man/mariadb-client-test-embedded.1

@@ -0,0 +1 @@
+.so man1/mariadb-client-test.1

man/mariadb-embedded.1

@@ -0,0 +1 @@
+.so man1/mariadb.1

man/mariadb-test-embedded.1

@@ -0,0 +1 @@
+.so man1/mariadb-test.1

man/mysql_client_test_embedded.1

@@ -1 +0,0 @@
-.so man1/mysql_client_test.1

man/mysql_embedded.1

@@ -1 +0,0 @@
-.so man1/mysql.1

man/mysqltest_embedded.1

@@ -1 +0,0 @@
-.so man1/mysqltest.1