diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 15:40:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 15:40:51 +0300 |
| commit | 496d0372ef2ff2a570c20923af4df32a03781acd (patch) | |
| tree | c15d45eeff0fbbfe6112816a72e10352551269ee /cmake | |
| parent | d4da131cff004e4157b755e417c49daef45ca80e (diff) | |
| parent | 5ba2aa1ddc074dc89db7f265ddb61ce96f714fc8 (diff) | |
| download | mariadb-git-496d0372ef2ff2a570c20923af4df32a03781acd.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/install_layout.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 2779e07e9dd..9e3549964e1 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -128,6 +128,8 @@ SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files") SET(INSTALL_MYSQLDATADIR_STANDALONE "data") SET(INSTALL_UNIX_ADDRDIR_STANDALONE "/tmp/mysql.sock") +SET(INSTALL_PAMDIR_STANDALONE "share") +SET(INSTALL_PAMDATADIR_STANDALONE "share") # # RPM layout # @@ -164,6 +166,7 @@ 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 "/${INSTALL_LIBDIR_RPM}/security") +SET(INSTALL_PAMDATADIR_RPM "/etc/security") # # DEB layout @@ -197,6 +200,7 @@ SET(INSTALL_SYSTEMD_UNITDIR_DEB "/lib/systemd/system") SET(INSTALL_SYSTEMD_SYSUSERSDIR_DEB "/usr/lib/sysusers.d") SET(INSTALL_SYSTEMD_TMPFILESDIR_DEB "/usr/lib/tmpfiles.d") SET(INSTALL_PAMDIR_DEB "/lib/${CMAKE_CXX_LIBRARY_ARCHITECTURE}/security") +SET(INSTALL_PAMDATADIR_DEB "/etc/security") # # SVR4 layout |