mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-25 02:49:32 +03:00
Use correct prefix for share/pam-configs
Respect the configured install prefix. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Arvind Sankar <nivedita@alum.mit.edu> Signed-off-by: Ryan Moeller <ryan@iXsystems.com> Closes #10604
This commit is contained in:
parent
3a92552f75
commit
2f571dbe06
@ -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)
|
||||
|
@ -348,6 +348,8 @@ image which is ZFS aware.
|
||||
--with-udevdir=%{_udevdir} \
|
||||
--with-udevruledir=%{_udevruledir} \
|
||||
--with-dracutdir=%{_dracutdir} \
|
||||
--with-pamconfigsdir=%{_datadir}/pam-configs \
|
||||
--with-pammoduledir=%{_libdir}/security \
|
||||
--with-python=%{__python} \
|
||||
--with-pkgconfigdir=%{_pkgconfigdir} \
|
||||
--disable-static \
|
||||
@ -355,7 +357,7 @@ image which is ZFS aware.
|
||||
%{debuginfo} \
|
||||
%{asan} \
|
||||
%{systemd} \
|
||||
--with-pammoduledir=%{_libdir}/security %{pam} \
|
||||
%{pam} \
|
||||
%{pyzfs}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
@ -472,7 +474,7 @@ systemctl --system daemon-reload >/dev/null || true
|
||||
%attr(440, root, root) %config(noreplace) %{_sysconfdir}/sudoers.d/*
|
||||
%if %{with pam}
|
||||
%{_libdir}/security/*
|
||||
%{_pamconfigsdir}/*
|
||||
%{_datadir}/pam-configs/*
|
||||
%endif
|
||||
|
||||
%files -n libzpool2
|
||||
|
Loading…
Reference in New Issue
Block a user