diff options
| author | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-03-23 12:28:13 +0100 |
|---|---|---|
| committer | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-03-23 12:28:13 +0100 |
| commit | 1f8c256c18d3b646162a6f592c7274a69d51f19d (patch) | |
| tree | e0cc984262e2eb3a49d3d993d8782613e45149f8 /cmake | |
| parent | 303ab1fc2717aa5a1c21c82eb581ca251f1ed2fe (diff) | |
| download | mariadb-git-1f8c256c18d3b646162a6f592c7274a69d51f19d.tar.gz | |
Try some more RPM fixes.
Diffstat (limited to 'cmake')
| -rwxr-xr-x | cmake/install_layout.cmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 250bd3cff5b..680fa5ff863 100755 --- a/cmake/install_layout.cmake +++ b/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") |