mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix mysql-test directory in RPMs.

Browse source 
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)
This commit is contained in:
Jonathan Perkin 2010-03-23 16:53:11 +01:00
commit b7795403ed
1 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
cmake/install_layout.cmake
View file

@ -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_BINDIR_RPM "bin")
SET(INSTALL_INCLUDEDIR_RPM "include/mysql")
IF(64BIT)
SET(INSTALL_LIBDIR_RPM "lib64")
SET(INSTALL_LIBDIR_RPM "lib64")
ELSE()
SET(INSTALL_LIBDIR_RPM "lib")
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_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_MYSQLDATADIR_RPM "var")
SET(INSTALL_SBINDIR_RPM "sbin")
SET(INSTALL_SHAREDIR_RPM "share")
#
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")