diff options
| author | Ed Schouten <ed@FreeBSD.org> | 2011-06-17 20:47:44 +0000 |
|---|---|---|
| committer | Ed Schouten <ed@FreeBSD.org> | 2011-06-17 20:47:44 +0000 |
| commit | f1c344b293cfcba047eb18904e3fa7d0d554dd9a (patch) | |
| tree | 923bd53925fdbc5da04a3c5fc968bf2920425054 | |
| parent | 1c2ed3845598b9926e9fc36da21372f28428e741 (diff) | |
| download | src-f1c344b293cfcba047eb18904e3fa7d0d554dd9a.tar.gz src-f1c344b293cfcba047eb18904e3fa7d0d554dd9a.zip | |
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.
Notes
Notes:
svn path=/head/; revision=223201
| -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 1e71afdcf10d..b7f0ecd7e546 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 8d24fc69dd3e..e5e44e9e0082 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 4538ee7b8af9..a0e0f545265e 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 7fc531ab8879..da50e175dc29 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 |