Fix mysql-test directory in RPMs.

While here:

 - split INSTALL_*DIR variables into two sections, first set the major
   variables, then second set the minor ones, using the major where
   appropriate.

 - format the settings for easier parsing (at least with a wide terminal)

cmake/install_layout.cmake

@@ -107,26 +107,29 @@ SET(INSTALL_DOCREADMEDIR_STANDALONE ".")
 SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files")
 SET(INSTALL_MYSQLDATADIR_STANDALONE "data")
 
+#
 # RPM layout
+#
 SET(INSTALL_BINDIR_RPM              "bin")
-SET(INSTALL_SBINDIR_RPM "sbin")
+SET(INSTALL_INCLUDEDIR_RPM          "include/mysql")
 IF(64BIT)
   SET(INSTALL_LIBDIR_RPM            "lib64")
 ELSE()
   SET(INSTALL_LIBDIR_RPM            "lib")
 ENDIF()
-SET(INSTALL_PLUGINDIR_RPM "${INSTALL_LIBDIR_RPM}/mysql/plugin")
-SET(INSTALL_DOCDIR_RPM "share/mysql/doc/MySQL-server-${MYSQL_NO_DASH_VERSION}")
-SET(INSTALL_MANDIR_RPM "share/man")
-SET(INSTALL_INCLUDEDIR_RPM "include/mysql")
-SET(INSTALL_MYSQLSHAREDIR_RPM "share/mysql")
+SET(INSTALL_SBINDIR_RPM             "sbin")
 SET(INSTALL_SHAREDIR_RPM            "share")
-SET(INSTALL_SCRIPTDIR_RPM "bin")
-SET(INSTALL_MYSQLTESTDIR_RPM "mysql-test")
-SET(INSTALL_SQLBENCHROOTDIR_RPM "")
-SET(INSTALL_DOCREADMEDIR_RPM "share/mysql/doc/MySQL-server-${MYSQL_NO_DASH_VERSION}")
-SET(INSTALL_SUPPORTFILESDIR_RPM "share/mysql")
+#
+SET(INSTALL_DOCDIR_RPM              "${INSTALL_SHAREDIR_RPM}/mysql/doc/MySQL-server-${MYSQL_NO_DASH_VERSION}")
+SET(INSTALL_DOCREADMEDIR_RPM        "${INSTALL_DOCDIR_RPM}")
+SET(INSTALL_MANDIR_RPM              "${INSTALL_SHAREDIR_RPM}/man")
 SET(INSTALL_MYSQLDATADIR_RPM        "var")
+SET(INSTALL_MYSQLSHAREDIR_RPM       "${INSTALL_SHAREDIR_RPM}/mysql")
+SET(INSTALL_MYSQLTESTDIR_RPM        "${INSTALL_SHAREDIR_RPM}/mysql-test")
+SET(INSTALL_PLUGINDIR_RPM           "${INSTALL_LIBDIR_RPM}/mysql/plugin")
+SET(INSTALL_SCRIPTDIR_RPM           "${INSTALL_BINDIR_RPM}")
+SET(INSTALL_SQLBENCHROOTDIR_RPM     "")
+SET(INSTALL_SUPPORTFILESDIR_RPM     "${INSTALL_SHAREDIR_RPM}/mysql")
 
 # DEB layout
 SET(INSTALL_BINDIR_DEB "bin")