=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v retrieving revision 1.66 retrieving revision 1.71 diff -u -r1.66 -r1.71 --- src/usr.bin/Makefile 2000/07/19 23:43:27 1.66 +++ src/usr.bin/Makefile 2001/09/03 05:34:43 1.71 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.66 2000/07/19 23:43:27 mickey Exp $ +# $OpenBSD: Makefile,v 1.71 2001/09/03 05:34:43 pvalchev Exp $ .include @@ -11,27 +11,25 @@ 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 + 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 sectok 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 usbhidctl 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 x99token 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, mips, powerpc, and hppa. -.if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "mips" && ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "hppa") +# 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+= elf2ecoff elf2aout -.elif ${MACHINE_ARCH} == "mips" SUBDIR+= elf2ecoff elf2aout .endif