* 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 0a0bdb6567d27319d7c3c483c28aa79ecda9616e..8f2ed2e2916e9621f200f3eca4013e06db86c9cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-10-22  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * 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  <nicolas.francois@centraliens.net>
 
        * man/su.1.xml: Document that su -c does not providea controlling

diff --git a/man/Makefile.am b/man/Makefile.am
index e99c4df82bcfd2f440c574c9b4496d714a896b5e..c02e13f0766722b7663d08f8fc8d32fd0f84ec9b 100644 (file)
--- 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="\"";} /^<!ENTITY .* * SYSTEM ".*">$$/{ f=FILENAME; sub(/.xml/,"",f); print f ": " $$2 }' $(man_XMANS) >> $@

diff --git a/man/fr/Makefile.am b/man/fr/Makefile.am
index 2907e7df8da82d9c844a6a4bb89a4a7b55d9ddbf..f77437113024f697623fcb0c1cc120330d1e9da7 100644 (file)
--- 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 d32b100e48ad1e696a16d031110f7c7a177877fa..a424fb5ca9037bbc0b7a998e90008ac97d5cb768 100644 (file)
--- 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 1cfd0971655b2e63f92606553588f8dc56a46e2b..11ecdf357bc89cf40f4d9c123673437d80ab3449 100644 (file)
--- 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 f71dbaece419b327267b94cbcfab72308f7f8984..27a5899728003fcb8163a1a048e5bfb71d5ed6f5 100644 (file)
--- 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 ed75f318e48129f75825b3d81cb263a8f5e15d33..33ac4a3c9286850636b4cc07577c1c1b44bddd9c 100644 (file)
--- 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 cc69383aff034f9f0b32f393d95e8f0592e9ae7f..4cfce863826ab480b85992f8dc5575f283d5de2c 100644 (file)
--- 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 d8a111f0fa640ee61ed19a39f0ea2df8f3600c4a..76819cb6984e0404acdb7f6aa953f3eabba1f21a 100644 (file)
--- 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