diff options
| -rw-r--r-- | etc/periodic/monthly/Makefile | 9 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 2 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_ACCT | 4 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 4 |
4 files changed, 6 insertions, 13 deletions
diff --git a/etc/periodic/monthly/Makefile b/etc/periodic/monthly/Makefile index 1e71afd..b7f0ecd 100644 --- a/etc/periodic/monthly/Makefile +++ b/etc/periodic/monthly/Makefile @@ -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> diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 8d24fc6..e5e44e9 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -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 diff --git a/tools/build/options/WITHOUT_ACCT b/tools/build/options/WITHOUT_ACCT index 4538ee7..a0e0f54 100644 --- a/tools/build/options/WITHOUT_ACCT +++ b/tools/build/options/WITHOUT_ACCT @@ -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 . diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 7fc531a..da50e17 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -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 |
