svn commit: r277737 - in head: etc/pam.d tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Mon Jan 26 08:50:12 2015
New Revision: 277737
URL: https://svnweb.freebsd.org/changeset/base/277737

Log:
  Honor MK_ACCT with etc/pam.d/atrun
  
  MFC after: 2 weeks
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/etc/pam.d/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc

Modified: head/etc/pam.d/Makefile
==============================================================================
--- head/etc/pam.d/Makefile	Mon Jan 26 08:46:26 2015	(r277736)
+++ head/etc/pam.d/Makefile	Mon Jan 26 08:50:12 2015	(r277737)
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 NO_OBJ=
 
 FILES=	README \
-	atrun \
 	cron \
 	ftpd \
 	imap \
@@ -15,6 +16,10 @@ FILES=	README \
 	telnetd \
 	xdm
 
+.if ${MK_AT} != "no"
+FILES+=	atrun
+.endif
+
 FILESDIR=	/etc/pam.d
 FILESMODE=	644
 FILESMODE_README=	444

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jan 26 08:46:26 2015	(r277736)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Mon Jan 26 08:50:12 2015	(r277737)
@@ -62,6 +62,7 @@ OLD_FILES+=usr/share/man/man8/amd64/apmc
 .endif
 
 .if ${MK_AT} == no
+OLD_FILES+=etc/pam.d/atrun
 OLD_FILES+=usr/bin/at
 OLD_FILES+=usr/bin/atq
 OLD_FILES+=usr/bin/atrm