[svn-upgrade] Integrating new upstream version, shadow (4.0.18.1)

man/ru/Makefile.am

@@ -1,16 +1,7 @@
 mandir = @mandir@/ru
 
-if USE_PAM
-man_nonpam =
-else
-man_nonpam = \
-	limits.5 \
-	login.access.5 \
-	porttime.5
-endif
-                        
 man_MANS = \
-	$(man_nonpam) \
+	$(man_nopam) \
 	chage.1 \
 	chfn.1 \
 	chgpasswd.8 \
@@ -53,8 +44,17 @@ man_MANS = \
 	vigr.8 \
 	vipw.8
 
+man_nopam = \
+	limits.5 \
+	login.access.5 \
+	porttime.5
+
+if !USE_PAM
+man_MANS += $(man_nopam)
+endif
+
 EXTRA_DIST = \
 	$(man_MANS) \
-	$(man_nonpam) \
+	$(man_nopam) \
 	id.1 \
 	sulogin.8