From b6b00dd55e035bfbe311a527b567962ffa77ee43 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 26 Jun 2024 18:18:37 +0200 Subject: Merging upstream version 1:4.15.2. Signed-off-by: Daniel Baumann --- man/generate_mans.mak | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) (limited to 'man/generate_mans.mak') diff --git a/man/generate_mans.mak b/man/generate_mans.mak index a0721b8..47f906f 100644 --- a/man/generate_mans.mak +++ b/man/generate_mans.mak @@ -1,3 +1,8 @@ +if HAVE_VENDORDIR +VENDORDIR_COND=with_vendordir +else +VENDORDIR_COND=without_vendordir +endif if USE_PAM PAM_COND=pam else @@ -20,12 +25,34 @@ else SHA_CRYPT_COND=no_sha_crypt endif +if USE_BCRYPT +BCRYPT_COND=bcrypt +else +BCRYPT_COND=no_bcrypt +endif + +if USE_YESCRYPT +YESCRYPT_COND=yescrypt +else +YESCRYPT_COND=no_yescrypt +endif + if ENABLE_SUBIDS SUBIDS_COND=subids else SUBIDS_COND=no_subids endif +if ENABLE_LASTLOG +if !USE_PAM +LASTLOG_COND=lastlog +else +LASTLOG_COND=no_lastlog +endif +else +LASTLOG_COND=no_lastlog +endif + if ENABLE_REGENERATE_MAN %.xml-config: %.xml if grep -q SHADOW-CONFIG-HERE $<; then \ @@ -35,11 +62,13 @@ if ENABLE_REGENERATE_MAN fi man1/% man3/% man5/% man8/%: %.xml-config Makefile config.xml - $(XSLTPROC) --stringparam profile.condition "$(PAM_COND);$(SHADOWGRP_COND);$(TCB_COND);$(SHA_CRYPT_COND);$(SUBIDS_COND)" \ + $(XSLTPROC) --stringparam profile.condition "$(PAM_COND);$(SHADOWGRP_COND);$(TCB_COND);$(SHA_CRYPT_COND);$(BCRYPT_COND);$(YESCRYPT_COND);$(SUBIDS_COND);$(VENDORDIR_COND);$(LASTLOG_COND)" \ --param "man.authors.section.enabled" "0" \ --stringparam "man.output.base.dir" "" \ + --stringparam vendordir "$(VENDORDIR)" \ --param "man.output.in.separate.dir" "1" \ - -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/profile-docbook.xsl $< + --path "$(srcdir)/login.defs.d" \ + -nonet $(top_srcdir)/man/shadow-man.xsl $< clean-local: rm -rf man1 man3 man5 man8 -- cgit v1.2.3