[Pkg-shadow-commits] r3532 - in upstream/trunk: . man man/fr man/it man/ja man/pl man/ru man/sv man/zh_CN

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-10-22 08:59:08 +0000 (Sat, 22 Oct 2011)
New Revision: 3532

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/man/Makefile.am
   upstream/trunk/man/fr/Makefile.am
   upstream/trunk/man/it/Makefile.am
   upstream/trunk/man/ja/Makefile.am
   upstream/trunk/man/pl/Makefile.am
   upstream/trunk/man/ru/Makefile.am
   upstream/trunk/man/sv/Makefile.am
   upstream/trunk/man/zh_CN/Makefile.am
Log:
	* 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).


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-10-22 08:56:51 UTC (rev 3531)
+++ upstream/trunk/ChangeLog	2011-10-22 08:59:08 UTC (rev 3532)
@@ -1,5 +1,13 @@
 2011-10-22  Nicolas François  <nicolas.francois at 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 at centraliens.net>
+
 	* man/su.1.xml: Document that su -c does not providea controlling
 	terminal.
 

Modified: upstream/trunk/man/Makefile.am
===================================================================
--- upstream/trunk/man/Makefile.am	2011-10-22 08:56:51 UTC (rev 3531)
+++ upstream/trunk/man/Makefile.am	2011-10-22 08:59:08 UTC (rev 3532)
@@ -166,7 +166,6 @@
 	$(man_MANS) \
 	$(man_XMANS) \
 	$(addprefix login.defs.d/,$(login_defs_v)) \
-	$(man_nopam) \
 	id.1 \
 	id.1.xml \
 	sulogin.8 \
@@ -174,6 +173,10 @@
 	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) >> $@

Modified: upstream/trunk/man/fr/Makefile.am
===================================================================
--- upstream/trunk/man/fr/Makefile.am	2011-10-22 08:56:51 UTC (rev 3531)
+++ upstream/trunk/man/fr/Makefile.am	2011-10-22 08:59:08 UTC (rev 3532)
@@ -52,8 +52,11 @@
 
 EXTRA_DIST = \
 	$(man_MANS) \
-	$(man_nopam) \
 	id.1
 
+if USE_PAM
+EXTRA_DIST += $(man_nopam)
+endif
+
 include ../generate_translations.mak
 

Modified: upstream/trunk/man/it/Makefile.am
===================================================================
--- upstream/trunk/man/it/Makefile.am	2011-10-22 08:56:51 UTC (rev 3531)
+++ upstream/trunk/man/it/Makefile.am	2011-10-22 08:59:08 UTC (rev 3532)
@@ -46,9 +46,12 @@
                         
 EXTRA_DIST = \
 	$(man_MANS) \
-	$(man_nopam) \
 	id.1 \
 	logoutd.8
 
+if USE_PAM
+EXTRA_DIST += $(man_nopam)
+endif
+
 include ../generate_translations.mak
 

Modified: upstream/trunk/man/ja/Makefile.am
===================================================================
--- upstream/trunk/man/ja/Makefile.am	2011-10-22 08:56:51 UTC (rev 3531)
+++ upstream/trunk/man/ja/Makefile.am	2011-10-22 08:59:08 UTC (rev 3532)
@@ -49,7 +49,10 @@
 
 EXTRA_DIST = \
 	$(man_MANS) \
-	$(man_nopam) \
 	id.1 \
 	shadow.3 \
 	sulogin.8
+
+if USE_PAM
+EXTRA_DIST += $(man_nopam)
+endif

Modified: upstream/trunk/man/pl/Makefile.am
===================================================================
--- upstream/trunk/man/pl/Makefile.am	2011-10-22 08:56:51 UTC (rev 3531)
+++ upstream/trunk/man/pl/Makefile.am	2011-10-22 08:59:08 UTC (rev 3532)
@@ -49,11 +49,14 @@
 
 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
 

Modified: upstream/trunk/man/ru/Makefile.am
===================================================================
--- upstream/trunk/man/ru/Makefile.am	2011-10-22 08:56:51 UTC (rev 3531)
+++ upstream/trunk/man/ru/Makefile.am	2011-10-22 08:59:08 UTC (rev 3532)
@@ -54,9 +54,12 @@
 
 EXTRA_DIST = \
 	$(man_MANS) \
-	$(man_nopam) \
 	id.1 \
 	sulogin.8
 
+if USE_PAM
+EXTRA_DIST += $(man_nopam)
+endif
+
 include ../generate_translations.mak
 

Modified: upstream/trunk/man/sv/Makefile.am
===================================================================
--- upstream/trunk/man/sv/Makefile.am	2011-10-22 08:56:51 UTC (rev 3531)
+++ upstream/trunk/man/sv/Makefile.am	2011-10-22 08:59:08 UTC (rev 3532)
@@ -53,8 +53,11 @@
 endif
 
 EXTRA_DIST = \
-	$(man_MANS) \
-	$(man_nopam)
+	$(man_MANS)
 
+if USE_PAM
+EXTRA_DIST += $(man_nopam)
+endif
+
 include ../generate_translations.mak
 

Modified: upstream/trunk/man/zh_CN/Makefile.am
===================================================================
--- upstream/trunk/man/zh_CN/Makefile.am	2011-10-22 08:56:51 UTC (rev 3531)
+++ upstream/trunk/man/zh_CN/Makefile.am	2011-10-22 08:59:08 UTC (rev 3532)
@@ -52,8 +52,11 @@
 
 EXTRA_DIST = \
 	$(man_MANS) \
-	$(man_nopam) \
 	id.1
 
+if USE_PAM
+EXTRA_DIST += $(man_nopam)
+endif
+
 include ../generate_translations.mak