svn commit: r223201 - in head: etc/periodic/monthly tools/build/mk
tools/build/options usr.sbin
Ed Schouten
ed at FreeBSD.org
Fri Jun 17 20:47:45 UTC 2011
Author: ed
Date: Fri Jun 17 20:47:44 2011
New Revision: 223201
URL: http://svn.freebsd.org/changeset/base/223201
Log:
Don't omit ac(8) as part of WITHOUT_ACCT.
The WITHOUT_ACCT switch is supposed to omit tools related to process
accounting, namely accton and sa. ac(8) is just a simple tool that
prints statistics based on data in the utx.log database. It has nothing
to do with the former.
Modified:
head/etc/periodic/monthly/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
head/tools/build/options/WITHOUT_ACCT
head/usr.sbin/Makefile
Modified: head/etc/periodic/monthly/Makefile
==============================================================================
--- head/etc/periodic/monthly/Makefile Fri Jun 17 20:19:11 2011 (r223200)
+++ head/etc/periodic/monthly/Makefile Fri Jun 17 20:47:44 2011 (r223201)
@@ -2,12 +2,7 @@
.include <bsd.own.mk>
-FILES= 999.local
-
-# NB: keep these sorted by MK_* knobs
-
-.if ${MK_ACCT} != "no"
-FILES+= 200.accounting
-.endif
+FILES= 200.accounting \
+ 999.local
.include <bsd.prog.mk>
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Jun 17 20:19:11 2011 (r223200)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Jun 17 20:47:44 2011 (r223201)
@@ -8,10 +8,8 @@
.if ${MK_ACCT} == no
OLD_FILES+=etc/periodic/daily/310.accounting
OLD_FILES+=etc/periodic/monthly/200.accounting
-OLD_FILES+=usr/sbin/ac
OLD_FILES+=usr/sbin/accton
OLD_FILES+=usr/sbin/sa
-OLD_FILES+=usr/share/man/man8/ac.8.gz
OLD_FILES+=usr/share/man/man8/accton.8.gz
OLD_FILES+=usr/share/man/man8/sa.8.gz
.endif
Modified: head/tools/build/options/WITHOUT_ACCT
==============================================================================
--- head/tools/build/options/WITHOUT_ACCT Fri Jun 17 20:19:11 2011 (r223200)
+++ head/tools/build/options/WITHOUT_ACCT Fri Jun 17 20:47:44 2011 (r223201)
@@ -1,5 +1,5 @@
.\" $FreeBSD$
Set to not build process accounting tools such as
-.Xr ac 8
+.Xr accton 8
and
-.Xr accton 8 .
+.Xr sa 8 .
Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile Fri Jun 17 20:19:11 2011 (r223200)
+++ head/usr.sbin/Makefile Fri Jun 17 20:47:44 2011 (r223201)
@@ -3,7 +3,8 @@
.include <bsd.own.mk>
-SUBDIR= adduser \
+SUBDIR= ac \
+ adduser \
arp \
bootparamd \
burncd \
@@ -99,7 +100,6 @@ SUBDIR= adduser \
# NB: keep these sorted by MK_* knobs
.if ${MK_ACCT} != "no"
-SUBDIR+= ac
SUBDIR+= accton
SUBDIR+= sa
.endif
More information about the svn-src-head
mailing list