diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-02-11 14:40:35 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-02-11 14:40:35 +0100 |
| commit | 646d1ec83a57d9a5b380079afc3612c1d9acadd5 (patch) | |
| tree | b46ec54915361f3baa221bcd01b4308a55c59c48 /cmake | |
| parent | c1eaa385ffb44bdf6264d2cc4b4cc0e10284c88a (diff) | |
| parent | 58b70dc13630d2f2f0244359d6351085d70fd5dd (diff) | |
| download | mariadb-git-646d1ec83a57d9a5b380079afc3612c1d9acadd5.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/cpack_rpm.cmake | 2 | ||||
| -rw-r--r-- | cmake/install_layout.cmake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 5dd33b623d0..1dad91e05a5 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -105,6 +105,8 @@ SET(ignored "%ignore /etc/systemd/system" "%ignore /lib" "%ignore /lib/security" + "%ignore /lib64" + "%ignore /lib64/security" "%ignore ${CMAKE_INSTALL_PREFIX}" "%ignore ${CMAKE_INSTALL_PREFIX}/bin" "%ignore ${CMAKE_INSTALL_PREFIX}/include" diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index ab19a7f0f11..49dceccb9d2 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -163,7 +163,7 @@ SET(INSTALL_UNIX_ADDRDIR_RPM "${INSTALL_MYSQLDATADIR_RPM}/mysql.sock" SET(INSTALL_SYSTEMD_UNITDIR_RPM "/usr/lib/systemd/system") SET(INSTALL_SYSTEMD_SYSUSERSDIR_RPM "/usr/lib/sysusers.d") SET(INSTALL_SYSTEMD_TMPFILESDIR_RPM "/usr/lib/tmpfiles.d") -SET(INSTALL_PAMDIR_RPM "/lib/security") +SET(INSTALL_PAMDIR_RPM "/${INSTALL_LIBDIR_RPM}/security") # # DEB layout |