From: nekral-guest Date: Sat, 22 Oct 2011 08:59:08 +0000 (+0000) Subject: * man/ja/Makefile.am, man/fr/Makefile.am, man/ru/Makefile.am, X-Git-Tag: 4.1.5~94 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c237be820b5412125b4837a83f32714e305e03f1;p=thirdparty%2Fshadow.git * man/ja/Makefile.am, man/fr/Makefile.am, man/ru/Makefile.am, man/sv/Makefile.am, man/pl/Makefile.am, man/zh_CN/Makefile.am, man/it/Makefile.am, man/Makefile.am: Include man_nopam in EXTRA_DIST only when USE_PAM (they are already in man_MANS otherwise). --- diff --git a/ChangeLog b/ChangeLog index 0a0bdb656..8f2ed2e29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-10-22 Nicolas François + + * man/ja/Makefile.am, man/fr/Makefile.am, man/ru/Makefile.am, + man/sv/Makefile.am, man/pl/Makefile.am, man/zh_CN/Makefile.am, + man/it/Makefile.am, man/Makefile.am: Include man_nopam in + EXTRA_DIST only when USE_PAM (they are already in man_MANS + otherwise). + 2011-10-22 Nicolas François * man/su.1.xml: Document that su -c does not providea controlling diff --git a/man/Makefile.am b/man/Makefile.am index e99c4df82..c02e13f07 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -166,7 +166,6 @@ EXTRA_DIST = \ $(man_MANS) \ $(man_XMANS) \ $(addprefix login.defs.d/,$(login_defs_v)) \ - $(man_nopam) \ id.1 \ id.1.xml \ sulogin.8 \ @@ -174,6 +173,10 @@ EXTRA_DIST = \ generate_mans.mak \ generate_translations.mak +if USE_PAM +EXTRA_DIST += $(man_nopam) +endif + generate_mans.deps: *.xml echo "# This file is generated" > $@ awk 'BEGIN{FS="\"";} /^$$/{ f=FILENAME; sub(/.xml/,"",f); print f ": " $$2 }' $(man_XMANS) >> $@ diff --git a/man/fr/Makefile.am b/man/fr/Makefile.am index 2907e7df8..f77437113 100644 --- a/man/fr/Makefile.am +++ b/man/fr/Makefile.am @@ -52,8 +52,11 @@ endif EXTRA_DIST = \ $(man_MANS) \ - $(man_nopam) \ id.1 +if USE_PAM +EXTRA_DIST += $(man_nopam) +endif + include ../generate_translations.mak diff --git a/man/it/Makefile.am b/man/it/Makefile.am index d32b100e4..a424fb5ca 100644 --- a/man/it/Makefile.am +++ b/man/it/Makefile.am @@ -46,9 +46,12 @@ endif EXTRA_DIST = \ $(man_MANS) \ - $(man_nopam) \ id.1 \ logoutd.8 +if USE_PAM +EXTRA_DIST += $(man_nopam) +endif + include ../generate_translations.mak diff --git a/man/ja/Makefile.am b/man/ja/Makefile.am index 1cfd09716..11ecdf357 100644 --- a/man/ja/Makefile.am +++ b/man/ja/Makefile.am @@ -49,7 +49,10 @@ endif EXTRA_DIST = \ $(man_MANS) \ - $(man_nopam) \ id.1 \ shadow.3 \ sulogin.8 + +if USE_PAM +EXTRA_DIST += $(man_nopam) +endif diff --git a/man/pl/Makefile.am b/man/pl/Makefile.am index f71dbaece..27a589972 100644 --- a/man/pl/Makefile.am +++ b/man/pl/Makefile.am @@ -49,11 +49,14 @@ endif EXTRA_DIST = \ $(man_MANS) \ - $(man_nopam) \ getspnam.3 \ id.1 \ shadow.3 \ sulogin.8 +if USE_PAM +EXTRA_DIST += $(man_nopam) +endif + include ../generate_translations.mak diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am index ed75f318e..33ac4a3c9 100644 --- a/man/ru/Makefile.am +++ b/man/ru/Makefile.am @@ -54,9 +54,12 @@ endif EXTRA_DIST = \ $(man_MANS) \ - $(man_nopam) \ id.1 \ sulogin.8 +if USE_PAM +EXTRA_DIST += $(man_nopam) +endif + include ../generate_translations.mak diff --git a/man/sv/Makefile.am b/man/sv/Makefile.am index cc69383af..4cfce8638 100644 --- a/man/sv/Makefile.am +++ b/man/sv/Makefile.am @@ -53,8 +53,11 @@ man_MANS += $(man_nopam) endif EXTRA_DIST = \ - $(man_MANS) \ - $(man_nopam) + $(man_MANS) + +if USE_PAM +EXTRA_DIST += $(man_nopam) +endif include ../generate_translations.mak diff --git a/man/zh_CN/Makefile.am b/man/zh_CN/Makefile.am index d8a111f0f..76819cb69 100644 --- a/man/zh_CN/Makefile.am +++ b/man/zh_CN/Makefile.am @@ -52,8 +52,11 @@ endif EXTRA_DIST = \ $(man_MANS) \ - $(man_nopam) \ id.1 +if USE_PAM +EXTRA_DIST += $(man_nopam) +endif + include ../generate_translations.mak