From: Iker Pedrosa Date: Thu, 13 Jul 2023 13:30:22 +0000 (+0200) Subject: man: conditionally build lastlog documentation X-Git-Tag: 4.14.0-rc1~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acea93eda905cf24023f2338bfebbc43429c8d18;p=thirdparty%2Fshadow.git man: conditionally build lastlog documentation Resolves: https://github.com/shadow-maint/shadow/issues/674 Signed-off-by: Iker Pedrosa --- diff --git a/man/Makefile.am b/man/Makefile.am index 30c73afd2..f9d7ecc10 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -26,7 +26,6 @@ man_MANS = \ man8/grpconv.8 \ man8/grpunconv.8 \ man5/gshadow.5 \ - man8/lastlog.8 \ man1/login.1 \ man5/login.defs.5 \ man8/logoutd.8 \ @@ -48,6 +47,10 @@ man_MANS = \ man8/vigr.8 \ man8/vipw.8 +if ENABLE_LASTLOG +man_MANS += man8/lastlog.8 +endif + man_nopam = \ man5/limits.5 \ man5/login.access.5 \ @@ -90,7 +93,6 @@ man_XMANS = \ groups.1.xml \ grpck.8.xml \ gshadow.5.xml \ - lastlog.8.xml \ limits.5.xml \ login.1.xml \ login.access.5.xml \ @@ -118,6 +120,10 @@ man_XMANS = \ usermod.8.xml \ vipw.8.xml +if ENABLE_LASTLOG +man_XMANS += lastlog.8.xml +endif + login_defs_v = \ CHFN_AUTH.xml \ CHFN_RESTRICT.xml \ diff --git a/man/cs/Makefile.am b/man/cs/Makefile.am index 3b2be0cef..84407d71d 100644 --- a/man/cs/Makefile.am +++ b/man/cs/Makefile.am @@ -12,13 +12,16 @@ man_MANS = \ man1/groups.1 \ man8/grpck.8 \ man5/gshadow.5 \ - man8/lastlog.8 \ man8/nologin.8 \ man5/passwd.5 \ man5/shadow.5 \ man1/su.1 \ man8/vipw.8 +if ENABLE_LASTLOG +man_MANS += man8/lastlog.8 +endif + EXTRA_DIST = $(man_MANS) \ man1/id.1 \ man8/groupmems.8 \ diff --git a/man/de/Makefile.am b/man/de/Makefile.am index 3cd302ee7..671432d39 100644 --- a/man/de/Makefile.am +++ b/man/de/Makefile.am @@ -21,7 +21,6 @@ man_MANS = \ man8/grpconv.8 \ man8/grpunconv.8 \ man5/gshadow.5 \ - man8/lastlog.8 \ man1/login.1 \ man5/login.defs.5 \ man8/logoutd.8 \ @@ -44,6 +43,10 @@ man_MANS = \ man8/vigr.8 \ man8/vipw.8 +if ENABLE_LASTLOG +man_MANS += man8/lastlog.8 +endif + man_nopam = \ man5/limits.5 \ man5/login.access.5 \ diff --git a/man/fr/Makefile.am b/man/fr/Makefile.am index 230d21263..335e02982 100644 --- a/man/fr/Makefile.am +++ b/man/fr/Makefile.am @@ -21,7 +21,6 @@ man_MANS = \ man8/grpconv.8 \ man8/grpunconv.8 \ man5/gshadow.5 \ - man8/lastlog.8 \ man1/login.1 \ man5/login.defs.5 \ man8/logoutd.8 \ @@ -44,6 +43,10 @@ man_MANS = \ man8/vigr.8 \ man8/vipw.8 +if ENABLE_LASTLOG +man_MANS += man8/lastlog.8 +endif + man_nopam = \ man5/limits.5 \ man5/login.access.5 \ diff --git a/man/generate_mans.mak b/man/generate_mans.mak index 10227e7ea..7d191dcb3 100644 --- a/man/generate_mans.mak +++ b/man/generate_mans.mak @@ -31,6 +31,16 @@ 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 \ @@ -40,7 +50,7 @@ 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);$(VENDORDIR_COND)" \ + $(XSLTPROC) --stringparam profile.condition "$(PAM_COND);$(SHADOWGRP_COND);$(TCB_COND);$(SHA_CRYPT_COND);$(SUBIDS_COND);$(VENDORDIR_COND);$(LASTLOG_COND)" \ --param "man.authors.section.enabled" "0" \ --stringparam "man.output.base.dir" "" \ --stringparam vendordir "$(VENDORDIR)" \ diff --git a/man/hu/Makefile.am b/man/hu/Makefile.am index e659aef11..205bb0a89 100644 --- a/man/hu/Makefile.am +++ b/man/hu/Makefile.am @@ -5,7 +5,6 @@ man_MANS = \ man1/chsh.1 \ man1/gpasswd.1 \ man1/groups.1 \ - man8/lastlog.8 \ man1/login.1 \ man1/newgrp.1 \ man1/passwd.1 \ @@ -13,5 +12,9 @@ man_MANS = \ man1/sg.1 \ man1/su.1 +if ENABLE_LASTLOG +man_MANS += man8/lastlog.8 +endif + EXTRA_DIST = $(man_MANS) diff --git a/man/it/Makefile.am b/man/it/Makefile.am index 94460aac5..b76187faf 100644 --- a/man/it/Makefile.am +++ b/man/it/Makefile.am @@ -21,7 +21,6 @@ man_MANS = \ man8/grpconv.8 \ man8/grpunconv.8 \ man5/gshadow.5 \ - man8/lastlog.8 \ man1/login.1 \ man5/login.defs.5 \ man8/logoutd.8 \ @@ -44,6 +43,10 @@ man_MANS = \ man8/vigr.8 \ man8/vipw.8 +if ENABLE_LASTLOG +man_MANS += man8/lastlog.8 +endif + man_nopam = \ man5/limits.5 \ man5/login.access.5 \ diff --git a/man/ja/Makefile.am b/man/ja/Makefile.am index ffb75a989..13f18da16 100644 --- a/man/ja/Makefile.am +++ b/man/ja/Makefile.am @@ -17,7 +17,6 @@ man_MANS = \ man8/grpck.8 \ man8/grpconv.8 \ man8/grpunconv.8 \ - man8/lastlog.8 \ man1/login.1 \ man5/login.defs.5 \ man8/logoutd.8 \ @@ -38,6 +37,10 @@ man_MANS = \ man8/vigr.8 \ man8/vipw.8 +if ENABLE_LASTLOG +man_MANS += man8/lastlog.8 +endif + man_nopam = \ man5/limits.5 \ man5/login.access.5 \ diff --git a/man/pl/Makefile.am b/man/pl/Makefile.am index 724d25f39..b2f096f7e 100644 --- a/man/pl/Makefile.am +++ b/man/pl/Makefile.am @@ -15,7 +15,6 @@ man_MANS = \ man8/groupmod.8 \ man1/groups.1 \ man8/grpck.8 \ - man8/lastlog.8 \ man8/logoutd.8 \ man1/newgrp.1 \ man1/sg.1 \ @@ -25,6 +24,10 @@ man_MANS = \ man8/vigr.8 \ man8/vipw.8 +if ENABLE_LASTLOG +man_MANS += man8/lastlog.8 +endif + man_nopam = \ man5/porttime.5 diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am index 8a776a87a..84d55d9ec 100644 --- a/man/ru/Makefile.am +++ b/man/ru/Makefile.am @@ -21,7 +21,6 @@ man_MANS = \ man8/grpconv.8 \ man8/grpunconv.8 \ man5/gshadow.5 \ - man8/lastlog.8 \ man1/login.1 \ man5/login.defs.5 \ man8/logoutd.8 \ @@ -44,6 +43,10 @@ man_MANS = \ man8/vigr.8 \ man8/vipw.8 +if ENABLE_LASTLOG +man_MANS += man8/lastlog.8 +endif + man_nopam = \ man5/limits.5 \ man5/login.access.5 \ diff --git a/man/sv/Makefile.am b/man/sv/Makefile.am index e64b7bc81..70329edf3 100644 --- a/man/sv/Makefile.am +++ b/man/sv/Makefile.am @@ -15,7 +15,6 @@ man_MANS = \ man1/groups.1 \ man8/grpck.8 \ man5/gshadow.5 \ - man8/lastlog.8 \ man8/logoutd.8 \ man1/newgrp.1 \ man8/nologin.8 \ @@ -29,6 +28,10 @@ man_MANS = \ man8/vigr.8 \ man8/vipw.8 +if ENABLE_LASTLOG +man_MANS += man8/lastlog.8 +endif + man_nopam = \ man5/limits.5 \ man5/porttime.5 diff --git a/man/uk/Makefile.am b/man/uk/Makefile.am index 30c862720..3fb5ffb3d 100644 --- a/man/uk/Makefile.am +++ b/man/uk/Makefile.am @@ -21,7 +21,6 @@ man_MANS = \ man8/grpconv.8 \ man8/grpunconv.8 \ man5/gshadow.5 \ - man8/lastlog.8 \ man1/login.1 \ man5/login.defs.5 \ man8/logoutd.8 \ @@ -44,6 +43,10 @@ man_MANS = \ man8/vigr.8 \ man8/vipw.8 +if ENABLE_LASTLOG +man_MANS += man8/lastlog.8 +endif + man_nopam = \ man5/login.access.5 \ man5/porttime.5 diff --git a/man/zh_CN/Makefile.am b/man/zh_CN/Makefile.am index e9d8f2c2b..a8b93a568 100644 --- a/man/zh_CN/Makefile.am +++ b/man/zh_CN/Makefile.am @@ -21,7 +21,6 @@ man_MANS = \ man8/grpconv.8 \ man8/grpunconv.8 \ man5/gshadow.5 \ - man8/lastlog.8 \ man1/login.1 \ man5/login.defs.5 \ man8/logoutd.8 \ @@ -44,6 +43,10 @@ man_MANS = \ man8/vigr.8 \ man8/vipw.8 +if ENABLE_LASTLOG +man_MANS += man8/lastlog.8 +endif + man_nopam = \ man5/limits.5 \ man5/login.access.5 \