Try some more RPM fixes.

cmake/install_layout.cmake

@@ -103,10 +103,14 @@ SET(INSTALL_MYSQLDATADIR_STANDALONE "data")
 # RPM layout
 SET(INSTALL_BINDIR_RPM "bin")
 SET(INSTALL_SBINDIR_RPM "sbin")
-SET(INSTALL_LIBDIR_RPM "lib/mysql")
-SET(INSTALL_PLUGINDIR_RPM "lib/mysql/plugin")
+IF(64BIT)
+  SET(INSTALL_LIBDIR_RPM "lib64/mysql")
+ELSE()
+  SET(INSTALL_LIBDIR_RPM "lib/mysql")
+ENDIF()
+SET(INSTALL_PLUGINDIR_RPM "${INSTALL_LIBDIR_RPM}/plugin")
 SET(INSTALL_DOCDIR_RPM "share/mysql/doc/MySQL-server-${MYSQL_NO_DASH_VERSION}")
-SET(INSTALL_MANDIR_RPM "share/mysql/man")
+SET(INSTALL_MANDIR_RPM "share/man")
 SET(INSTALL_INCLUDEDIR_RPM "include/mysql")
 SET(INSTALL_MYSQLSHAREDIR_RPM "share/mysql")
 SET(INSTALL_SHAREDIR_RPM "share")