From 2f571dbe06e3d65a3ddadca54d94e4ee2798529d Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Thu, 30 Jul 2020 12:09:46 -0400 Subject: Use correct prefix for share/pam-configs Respect the configured install prefix. Reviewed-by: Brian Behlendorf Reviewed-by: Arvind Sankar Signed-off-by: Ryan Moeller Closes #10604 --- config/user-pam.m4 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/user-pam.m4 b/config/user-pam.m4 index fc29a1e1b..9db35808c 100644 --- a/config/user-pam.m4 +++ b/config/user-pam.m4 @@ -12,8 +12,9 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_PAM], [ AC_ARG_WITH(pamconfigsdir, AS_HELP_STRING([--with-pamconfigsdir=DIR], - [install pam-config files in dir [[/usr/share/pamconfigs]]]), - [pamconfigsdir="$withval"],[pamconfigsdir=/usr/share/pam-configs]) + [install pam-config files in dir [DATADIR/pam-configs]]), + [pamconfigsdir="$withval"], + [pamconfigsdir='${datadir}/pam-configs']) AS_IF([test "x$enable_pam" != "xno"], [ AC_CHECK_HEADERS([security/pam_modules.h], [ @@ -29,7 +30,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_PAM], [ ]) ]) AS_IF([test "x$enable_pam" = "xyes"], [ - DEFINE_PAM='--with "pam" --define "_pamconfigsdir $(pamconfigsdir)"' + DEFINE_PAM='--with pam' ]) AC_SUBST(DEFINE_PAM) AC_SUBST(pammoduledir) -- cgit v1.2.3