summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-04-28 22:29:13 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-04-28 22:29:13 +0300
commit1fbdcada73c1861b85080eede95140296d6a3c20 (patch)
tree12c9dc1184ca62dcdee10e7916a44bc203799529 /cmake
parentc755974775a7a7f4fc24abeacd2fc9ea7bf0c247 (diff)
parentdd5c307cb00bfde6c88bf125f61b3e0d85dc79a5 (diff)
downloadmariadb-git-1fbdcada73c1861b85080eede95140296d6a3c20.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'cmake')
-rw-r--r--cmake/install_layout.cmake4
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