===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.1
retrieving revision 1.12
diff -u -r1.1 -r1.12
--- src/usr.bin/Makefile	1995/10/18 08:44:52	1.1
+++ src/usr.bin/Makefile	1996/07/16 07:36:16	1.12
@@ -1,31 +1,29 @@
+#	$OpenBSD: Makefile,v 1.12 1996/07/16 07:36:16 pefo Exp $
+#	$NetBSD: Makefile,v 1.62 1996/03/10 05:45:43 thorpej Exp $
 #	from: @(#)Makefile	5.8.1.1 (Berkeley) 5/8/91
-#	$Id: Makefile,v 1.1 1995/10/18 08:44:52 deraadt Exp $
 
-SUBDIR=	apply apropos asa at banner basename bdes biff cal calendar cap_mkdb \
-	checknr chflags chpass cksum cmp col colcrt colrm column comm \
-	compress crontab ctags cut dirname du \
+SUBDIR=	apply apropos arch asa at awk banner basename bdes biff cal calendar \
+	cap_mkdb checknr chflags chpass cksum cmp col colcrt colrm column \
+	comm compress cpp crontab ctags cut dirname du \
 	env error expand false file find finger fmt fold fpr from \
 	fsplit fstat ftp gencat getconf getopt head hexdump id indent \
-	ipcrm ipcs join jot kdump ktrace lam last lastcomm leave lex locate \
-	lock logger login logname look lorder m4 machine mail make man mesg \
-	mkdep mkfifo mkstr modstat more msgs netstat newsyslog nfsstat nice \
-	nohup pagesize passwd paste patch pr printenv printf quota \
-	rdist renice rev rlogin rpcgen rpcinfo rs \
+	ipcrm ipcs join jot kdump ktrace lam last lastcomm leave less lex \
+	locate lock logger login logname look lorder m4 machine mail make man \
+	mesg mkdep mkfifo mkstr modstat msgs netstat newsyslog nfsstat nice \
+	nohup oldrdist pagesize passwd paste patch pr printenv printf quota \
+	rdist rdistd renice rev rlogin rpcgen rpcinfo rs \
 	rsh rup ruptime rusers rwall rwho \
-	script sed shar showmount skey skeyinit soelim split strings \
-	su systat tail talk tcopy tee telnet tftp time \
+	script sed shar showmount skey skeyinit soelim split \
+	su sup systat tail talk tcopy tee telnet tftp time \
 	tip tn3270 touch tput tr true tset tsort tty ul uname unexpand \
 	unifdef uniq units unvis users uudecode uuencode \
 	vacation vgrind vi vis vmstat w wall wc what whatis whereis \
 	which who whois window write \
 	xargs xinstall xlint xstr yacc yes ypcat ypmatch ypwhich
 
-# Don't use the standard tool chain on the alpha.
-.if (${MACHINE_ARCH} != "alpha")
-SUBDIR+= ar gprof nm ranlib size strip
-.endif
-.if (${MACHINE_ARCH} == "sparc")
-SUBDIR+= fdeject
+# Don't use the standard tool chain on the alpha or mips.
+.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "mips")
+SUBDIR+= ar gprof nm ranlib size strip strings
 .endif
 
 .include <bsd.subdir.mk>