summaryrefslogtreecommitdiff
path: root/plugin
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 /plugin
parentc755974775a7a7f4fc24abeacd2fc9ea7bf0c247 (diff)
parentdd5c307cb00bfde6c88bf125f61b3e0d85dc79a5 (diff)
downloadmariadb-git-1fbdcada73c1861b85080eede95140296d6a3c20.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'plugin')
-rw-r--r--plugin/auth_pam/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugin/auth_pam/CMakeLists.txt b/plugin/auth_pam/CMakeLists.txt
index c826b422240..ac598e4ffa6 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
MYSQL_ADD_PLUGIN(auth_pam auth_pam.c LINK_LIBRARIES pam MODULE_ONLY)
IF(TARGET auth_pam)
@@ -31,7 +31,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)