diff options
| author | bapt <bapt@FreeBSD.org> | 2014-11-22 01:27:45 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-11-22 01:27:45 +0000 |
| commit | c6174eb57aa8d47866f82960faf3e9f775232925 (patch) | |
| tree | 813d2bca218b1e271bd4c54310ffc58df08350a9 /usr.bin | |
| parent | 46ace2ba1695ac922032e5e7ffe97f01f418ad60 (diff) | |
| download | FreeBSD-src-c6174eb57aa8d47866f82960faf3e9f775232925.zip FreeBSD-src-c6174eb57aa8d47866f82960faf3e9f775232925.tar.gz | |
Revert accidently message Makefile from 274836 and connect soeliminate(1)
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 37b672c..ccff4eb 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,7 +1,7 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend @@ -165,6 +165,7 @@ SUBDIR= alias \ ${_tests} \ tftp \ time \ + timeout \ tip \ top \ touch \ @@ -184,7 +185,6 @@ SUBDIR= alias \ unvis \ uudecode \ uuencode \ - vi \ vis \ vmstat \ w \ @@ -234,6 +234,10 @@ SUBDIR+= calendar _clang= clang .endif +.if ${MK_FMAKE} != "no" +SUBDIR+= make +.endif + .if ${MK_GPL_DTC} != "yes" SUBDIR+= dtc .endif @@ -266,10 +270,6 @@ SUBDIR+= drill SUBDIR+= host .endif -.if ${MK_LIBTHR} != "no" -SUBDIR+= csup -.endif - .if ${MK_LOCATE} != "no" SUBDIR+= locate .endif @@ -283,11 +283,7 @@ SUBDIR+= msgs .endif .if ${MK_MAKE} != "no" -.if ${MK_BMAKE} != "no" SUBDIR+= bmake -.else -SUBDIR+= make -.endif .endif .if ${MK_MAN_UTILS} != "no" @@ -363,6 +359,10 @@ SUBDIR+= xstr SUBDIR+= yacc .endif +.if ${MK_VI} != "no" +SUBDIR+= vi +.endif + .if ${MK_VT} != "no" SUBDIR+= vtfontcvt .endif |
