svn commit: r274837 - head/usr.bin
Baptiste Daroussin
bapt at FreeBSD.org
Sat Nov 22 01:27:46 UTC 2014
Author: bapt
Date: Sat Nov 22 01:27:45 2014
New Revision: 274837
URL: https://svnweb.freebsd.org/changeset/base/274837
Log:
Revert accidently message Makefile from 274836 and connect soeliminate(1)
Modified:
head/usr.bin/Makefile
Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile Sat Nov 22 01:22:03 2014 (r274836)
+++ head/usr.bin/Makefile Sat Nov 22 01:27:45 2014 (r274837)
@@ -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
More information about the svn-src-all
mailing list