summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Perkin <jonathan.perkin@oracle.com>2010-03-23 13:56:28 +0100
committerJonathan Perkin <jonathan.perkin@oracle.com>2010-03-23 13:56:28 +0100
commit912708c35bd1323b2f39267770446178ccb8d15b (patch)
tree2426ec24aafd1fb13d27ff7d5f16bb99a89eba44
parent1f8c256c18d3b646162a6f592c7274a69d51f19d (diff)
downloadmariadb-git-912708c35bd1323b2f39267770446178ccb8d15b.tar.gz
Install libs directly into %{_libdir}
-rwxr-xr-xcmake/install_layout.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
index 680fa5ff863..67d90309b12 100755
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
@@ -104,11 +104,11 @@ SET(INSTALL_MYSQLDATADIR_STANDALONE "data")
SET(INSTALL_BINDIR_RPM "bin")
SET(INSTALL_SBINDIR_RPM "sbin")
IF(64BIT)
- SET(INSTALL_LIBDIR_RPM "lib64/mysql")
+ SET(INSTALL_LIBDIR_RPM "lib64")
ELSE()
- SET(INSTALL_LIBDIR_RPM "lib/mysql")
+ SET(INSTALL_LIBDIR_RPM "lib")
ENDIF()
-SET(INSTALL_PLUGINDIR_RPM "${INSTALL_LIBDIR_RPM}/plugin")
+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")