diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 09:05:15 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-29 09:05:15 +0300 |
| commit | 0632b8034b08c88176dc7db12ba53df04edd9300 (patch) | |
| tree | 5047cc21a5cab2318bd8421f85f56b3e201ddd4a /plugin | |
| parent | 503fd2115bdc79f0b005917e058855411fdeb691 (diff) | |
| parent | 1fbdcada73c1861b85080eede95140296d6a3c20 (diff) | |
| download | mariadb-git-0632b8034b08c88176dc7db12ba53df04edd9300.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/auth_pam/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugin/auth_pam/CMakeLists.txt b/plugin/auth_pam/CMakeLists.txt index 89d5cc6a8af..f1b95e7d91e 100644 --- a/plugin/auth_pam/CMakeLists.txt +++ b/plugin/auth_pam/CMakeLists.txt @@ -22,7 +22,7 @@ IF(HAVE_PAM_APPL_H) IF(HAVE_STRNDUP) ADD_DEFINITIONS(-DHAVE_STRNDUP) ENDIF(HAVE_STRNDUP) - FIND_LIBRARY(PAM_LIBRARY pam) + FIND_LIBRARY(PAM_LIBRARY pam) # for srpm build-depends detection ADD_DEFINITIONS(-D_GNU_SOURCE) MYSQL_ADD_PLUGIN(auth_pam_v1 auth_pam_v1.c LINK_LIBRARIES pam MODULE_ONLY) MYSQL_ADD_PLUGIN(auth_pam auth_pam.c LINK_LIBRARIES pam dl MODULE_ONLY) @@ -42,7 +42,7 @@ IF(HAVE_PAM_APPL_H) SET_TARGET_PROPERTIES (pam_user_map PROPERTIES PREFIX "") IF(INSTALL_PAMDIR) INSTALL(TARGETS pam_user_map DESTINATION ${INSTALL_PAMDIR} COMPONENT Server) - INSTALL(FILES mapper/user_map.conf DESTINATION /etc/security COMPONENT Server) + INSTALL(FILES mapper/user_map.conf DESTINATION ${INSTALL_PAMDATADIR} COMPONENT Server) ENDIF() ENDIF() ENDIF(HAVE_PAM_APPL_H) |