===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v
retrieving revision 1.48
retrieving revision 1.68
diff -u -r1.48 -r1.68
--- src/usr.bin/Makefile	1998/04/26 21:58:16	1.48
+++ src/usr.bin/Makefile	2001/07/11 03:02:24	1.68
@@ -1,42 +1,35 @@
-#	$OpenBSD: Makefile,v 1.48 1998/04/26 21:58:16 provos Exp $
+#	$OpenBSD: Makefile,v 1.68 2001/07/11 03:02:24 pvalchev Exp $
 
 .include <bsd.own.mk>
 
-SUBDIR= apply apropos arch asa at aucat audioctl awk banner basename bdes biff \
-	cat calendar cap_mkdb cdio checknr chflags chpass cksum cmp col colcrt \
-	colrm column comm compile_et compress cpp crontab ctags cut dirname \
-	du elf2olf encrypt env error expand false file file2c find finger fmt \
-	fold from fsplit fstat ftp gencat getconf getopt gprof head hexdump \
-	id indent \
-	info_mkdb ipcrm ipcs join jot kdump ktrace lam last lastcomm leave \
-	less lex lndir locate lock logger login logname look lorder m4 \
-	machine mail make man mesg mixerctl mk_cmds mkdep mkfifo mkstr mktemp \
-	modstat msgs nc netstat newsyslog \
-	nfsstat nice nohup oldrdist pagesize passwd paste patch pr printenv \
-	printf quota rdist rdistd readlink renice rev rlogin rpcgen rpcinfo rs \
-	rsh rup ruptime rusers rwall rwho \
-	script sed shar showmount skey skeyaudit skeyinfo skeyinit soelim sort \
-	split su sup systat tail talk tcopy tee telnet tftp time \
-	tip tn3270 top 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 \
-	which who whois window write \
-	xargs xinstall xlint xstr yacc yes
+SUBDIR= apply apropos arch asa at aucat audioctl awk banner basename bdes \
+	biff cal calendar cap_mkdb cdio checknr chpass cksum cmp col \
+	colcrt colrm column comm compile_et compress cpp crontab ctags cut \
+	dirname du elf2olf encrypt env error expand false file file2c find \
+	finger fmt fold from fsplit fstat ftp gencat getconf getopt gprof \
+	head hexdump id indent infocmp ipcrm ipcs join jot kdump keynote \
+	ktrace lam last lastcomm leave less lex lndir locate lock logger \
+	login logname look lorder m4 mail make man mesg mg midiplay mixerctl \
+	mkdep mkstr mktemp modstat msgs nc netstat newsyslog nfsstat nice \
+	nohup oldrdist pagesize passwd paste patch pctr pr printenv printf quota \
+	rdist rdistd readlink renice rev rlogin rpcgen rpcinfo rs rsh rup \
+	ruptime rusers rwall rwho script sed shar showmount skey skeyaudit \
+	skeyinfo skeyinit sort split ssh su sup systat sudo tail talk tcopy \
+	tee telnet tftp tic time tip tn3270 top 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 which \
+	who whois window write xargs xinstall xlint xstr yacc yes
 
-.if (${YP} == "yes")
+.if (${YP:L} == "yes")
 SUBDIR+=ypcat ypmatch ypwhich
 .endif
 
-# Don't use the standard tool chain on the alpha or mips.
-.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "mips" && ${MACHINE_ARCH} != "powerpc")
+# Don't use the standard tool chain on the alpha, powerpc, and hppa.
+.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "hppa")
 SUBDIR+= ar nm ranlib size strip strings
 .endif
 
 .if   make(clean) || make(cleandir) || make(obj)
-SUBDIR+= pctr elf2ecoff elf2aout
-.elif ${MACHINE_ARCH} == "i386"
-SUBDIR+= pctr
-.elif ${MACHINE_ARCH} == "mips"
 SUBDIR+= elf2ecoff elf2aout
 .endif