=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/Makefile,v retrieving revision 1.65 retrieving revision 1.68 diff -u -r1.65 -r1.68 --- src/usr.bin/Makefile 2000/05/29 06:54:20 1.65 +++ src/usr.bin/Makefile 2001/07/11 03:02:24 1.68 @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.65 2000/05/29 06:54:20 deraadt Exp $ +# $OpenBSD: Makefile,v 1.68 2001/07/11 03:02:24 pvalchev Exp $ .include SUBDIR= apply apropos arch asa at aucat audioctl awk banner basename bdes \ - biff cal calendar cap_mkdb cdio checknr chflags chpass cksum cmp col \ + 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 \ @@ -20,18 +20,16 @@ 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, 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