summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>1999-02-13 02:54:17 +0000
committerlukem <lukem@NetBSD.org>1999-02-13 02:54:17 +0000
commitdcab0210a01af9b73b50a3c45f6cd7b0192d3f2a (patch)
treec962038cb859d0402d27e38d0d596308ce6a7336
parent22a5cb007fa30a3bcb21050c2808f836b62821c7 (diff)
convert from NOxxx= to MKxxx=no.
include <bsd.own.mk> if testing a MKxxx variable.
-rw-r--r--Makefile36
-rw-r--r--distrib/utils/init_s/Makefile4
-rw-r--r--distrib/utils/libhack/Makefile9
-rw-r--r--distrib/utils/more/Makefile5
-rw-r--r--distrib/utils/ssh/Makefile4
-rw-r--r--distrib/utils/sysinst/Makefile.inc4
-rw-r--r--distrib/utils/tls/Makefile4
-rw-r--r--distrib/utils/x_dd/Makefile4
-rw-r--r--distrib/utils/x_ftp/Makefile4
-rw-r--r--distrib/utils/x_ifconfig/Makefile4
-rw-r--r--distrib/utils/x_netstat/Makefile4
-rw-r--r--distrib/utils/x_route/Makefile4
-rw-r--r--distrib/utils/x_sh/Makefile6
-rw-r--r--distrib/utils/zcat/Makefile4
-rw-r--r--etc/Makefile4
-rw-r--r--games/atc/Makefile6
-rw-r--r--games/backgammon/common_source/Makefile6
-rw-r--r--games/backgammon/teachgammon/Makefile4
-rw-r--r--games/boggle/Makefile6
-rw-r--r--games/boggle/boggle/Makefile6
-rw-r--r--games/boggle/mkdict/Makefile4
-rw-r--r--games/boggle/mkindex/Makefile4
-rw-r--r--games/canfield/cfscores/Makefile4
-rw-r--r--games/cribbage/Makefile6
-rw-r--r--games/fish/Makefile6
-rw-r--r--games/fortune/datfiles/Makefile4
-rw-r--r--games/fortune/unstr/Makefile4
-rw-r--r--games/larn/Makefile6
-rw-r--r--games/monop/Makefile6
-rw-r--r--games/morse/Makefile4
-rw-r--r--games/ppt/Makefile4
-rw-r--r--games/primes/Makefile4
-rw-r--r--games/quiz/Makefile6
-rw-r--r--games/snake/snscore/Makefile4
-rw-r--r--games/wargames/Makefile4
-rw-r--r--games/wump/Makefile6
-rw-r--r--gnu/games/chess/Makefile4
-rw-r--r--gnu/lib/libbfd/Makefile14
-rw-r--r--gnu/lib/libg2c/Makefile4
-rw-r--r--gnu/lib/libgcc/Makefile8
-rw-r--r--gnu/lib/libmalloc/Makefile4
-rw-r--r--gnu/lib/libobjc/Makefile4
-rw-r--r--gnu/lib/libstdc++/Makefile6
-rw-r--r--gnu/libexec/uucp/libunix/Makefile10
-rw-r--r--gnu/libexec/uucp/libuuconf/Makefile8
-rw-r--r--gnu/libexec/uucp/libuucp/Makefile8
-rw-r--r--gnu/libexec/uucp/uuchk/Makefile4
-rw-r--r--gnu/libexec/uucp/uuconv/Makefile4
-rw-r--r--gnu/libexec/uucp/uulog/Makefile4
-rw-r--r--gnu/libexec/uucp/uuname/Makefile4
-rw-r--r--gnu/libexec/uucp/uupick/Makefile4
-rw-r--r--gnu/usr.bin/binutils/common/Makefile8
-rw-r--r--gnu/usr.bin/egcs/Makefile.cc14
-rw-r--r--gnu/usr.bin/egcs/Makefile.inc4
-rw-r--r--gnu/usr.bin/egcs/collect2/Makefile4
-rw-r--r--gnu/usr.bin/egcs/common/Makefile8
-rw-r--r--gnu/usr.bin/gasp/Makefile4
-rw-r--r--gnu/usr.bin/gdb/Makefile4
-rw-r--r--gnu/usr.bin/grep/common/Makefile10
-rw-r--r--gnu/usr.bin/grep/egrep/Makefile4
-rw-r--r--gnu/usr.bin/grep/fgrep/Makefile4
-rw-r--r--gnu/usr.bin/groff/Makefile6
-rw-r--r--gnu/usr.bin/groff/Makefile.cfg4
-rw-r--r--gnu/usr.bin/groff/devices/Makefile.dev6
-rw-r--r--gnu/usr.bin/groff/devices/devX100-12/Makefile4
-rw-r--r--gnu/usr.bin/groff/devices/devX100/Makefile4
-rw-r--r--gnu/usr.bin/groff/devices/devX75-12/Makefile4
-rw-r--r--gnu/usr.bin/groff/devices/devX75/Makefile4
-rw-r--r--gnu/usr.bin/groff/devices/devdvi/Makefile4
-rw-r--r--gnu/usr.bin/groff/devices/devlj4/Makefile4
-rw-r--r--gnu/usr.bin/groff/devices/devps/Makefile4
-rw-r--r--gnu/usr.bin/groff/indxbib/Makefile6
-rw-r--r--gnu/usr.bin/groff/libbib/Makefile8
-rw-r--r--gnu/usr.bin/groff/libdriver/Makefile8
-rw-r--r--gnu/usr.bin/groff/libgroff/Makefile8
-rw-r--r--gnu/usr.bin/groff/mm/Makefile6
-rw-r--r--gnu/usr.bin/groff/mm/mm/Makefile6
-rw-r--r--gnu/usr.bin/groff/tmac/Makefile6
-rw-r--r--gnu/usr.bin/groff/troff/Makefile6
-rw-r--r--gnu/usr.bin/rcs/lib/Makefile6
-rw-r--r--gnu/usr.bin/send-pr/Makefile6
-rw-r--r--gnu/usr.bin/texinfo/common/Makefile10
-rw-r--r--gnu/usr.bin/texinfo/info/Makefile4
-rw-r--r--gnu/usr.bin/texinfo/install-info/Makefile4
-rw-r--r--gnu/usr.bin/texinfo/makeinfo/Makefile4
-rw-r--r--gnu/usr.bin/texinfo/texindex/Makefile4
-rw-r--r--include/Makefile4
-rw-r--r--lib/libarch/m68k/Makefile4
-rw-r--r--lib/libbz2/Makefile4
-rw-r--r--lib/libc/md/Makefile.inc6
-rw-r--r--lib/libcompat/Makefile4
-rw-r--r--lib/libl/Makefile4
-rw-r--r--lib/librmt/Makefile6
-rw-r--r--lib/librpcsvc/Makefile6
-rw-r--r--lib/liby/Makefile4
-rw-r--r--lib/libz/Makefile4
-rw-r--r--libexec/ld.elf_so/Makefile6
-rw-r--r--regress/include/bitstring/Makefile4
-rw-r--r--regress/include/stdarg/Makefile4
-rw-r--r--regress/include/varargs/Makefile4
-rw-r--r--regress/lib/libc/_setjmp/Makefile4
-rw-r--r--regress/lib/libc/arch/alpha/divremtest/Makefile4
-rw-r--r--regress/lib/libc/db/Makefile4
-rw-r--r--regress/lib/libc/ieeefp/except/Makefile5
-rw-r--r--regress/lib/libc/ieeefp/round/Makefile5
-rw-r--r--regress/lib/libc/regex/Makefile4
-rw-r--r--regress/lib/libc/setjmp/Makefile4
-rw-r--r--regress/lib/libc/sigsetjmp/Makefile4
-rw-r--r--regress/lib/libc/time/strptime/Makefile4
-rw-r--r--regress/sys/arch/i386/ldt/Makefile4
-rw-r--r--regress/sys/arch/m68k/060sp/Makefile4
-rw-r--r--regress/sys/arch/m68k/emuspeed/Makefile4
-rw-r--r--regress/sys/kern/execve/Makefile4
-rw-r--r--regress/sys/kern/unfdpass/Makefile4
-rw-r--r--regress/usr.bin/m4/Makefile4
-rw-r--r--sbin/edlabel/Makefile4
-rw-r--r--sbin/fdisk/mbr/Makefile4
-rw-r--r--share/Makefile4
-rw-r--r--share/dict/Makefile4
-rw-r--r--share/doc/psd/Makefile4
-rw-r--r--share/doc/smm/Makefile4
-rw-r--r--share/doc/usd/Makefile4
-rw-r--r--share/examples/amd/Makefile8
-rw-r--r--share/examples/emul/svr4/etc/Makefile8
-rw-r--r--share/examples/emul/ultrix/etc/Makefile8
-rw-r--r--share/examples/ftpd/Makefile8
-rw-r--r--share/examples/supfiles/Makefile8
-rw-r--r--share/lkm/Makefile4
-rw-r--r--share/lkm/misc/test/Makefile4
-rw-r--r--share/lkm/syscall/test/Makefile4
-rw-r--r--share/man/Makefile6
-rw-r--r--share/man/man0/Makefile8
-rw-r--r--share/misc/Makefile6
-rw-r--r--share/mk/Makefile8
-rw-r--r--share/skel/Makefile4
-rw-r--r--share/tabset/Makefile4
-rw-r--r--share/zoneinfo/Makefile8
-rw-r--r--sys/arch/alpha/stand/Makefile.bootprogs4
-rw-r--r--sys/arch/alpha/stand/installboot/Makefile4
-rw-r--r--sys/arch/alpha/stand/setnetbootinfo/Makefile4
-rw-r--r--sys/arch/amiga/stand/binpatch/Makefile4
-rw-r--r--sys/arch/amiga/stand/bootblock/aout2bb/Makefile4
-rw-r--r--sys/arch/amiga/stand/bootblock/installboot/Makefile4
-rw-r--r--sys/arch/amiga/stand/bootblock/txlt/Makefile4
-rw-r--r--sys/arch/amiga/stand/loadkmap/Makefile4
-rw-r--r--sys/arch/amiga/stand/loadkmap/Makefile.inc4
-rw-r--r--sys/arch/amiga/stand/loadkmap/din/Makefile4
-rw-r--r--sys/arch/amiga/stand/loadkmap/es/Makefile4
-rw-r--r--sys/arch/amiga/stand/loadkmap/fr/Makefile4
-rw-r--r--sys/arch/amiga/stand/loadkmap/sw/Makefile4
-rw-r--r--sys/arch/amiga/stand/loadkmap/us/Makefile4
-rw-r--r--sys/arch/atari/stand/binpatch/Makefile4
-rw-r--r--sys/arch/atari/stand/bootpref/Makefile4
-rw-r--r--sys/arch/atari/stand/bootxx/Makefile4
-rw-r--r--sys/arch/atari/stand/edahdi/Makefile4
-rw-r--r--sys/arch/atari/stand/installboot/Makefile4
-rw-r--r--sys/arch/atari/stand/libsa/Makefile6
-rw-r--r--sys/arch/atari/stand/loadkmap/Makefile4
-rw-r--r--sys/arch/atari/stand/msconfig/Makefile4
-rw-r--r--sys/arch/atari/stand/xxboot/ahdi-sdb00t/Makefile4
-rw-r--r--sys/arch/atari/stand/xxboot/ahdi-wdb00t/Makefile4
-rw-r--r--sys/arch/atari/stand/xxboot/ahdi-xxboot/Makefile4
-rw-r--r--sys/arch/atari/stand/xxboot/fdboot/Makefile4
-rw-r--r--sys/arch/atari/stand/xxboot/sdboot/Makefile4
-rw-r--r--sys/arch/atari/stand/xxboot/wdboot/Makefile4
-rw-r--r--sys/arch/bebox/stand/boot/Makefile4
-rw-r--r--sys/arch/hp300/stand/Makefile.buildboot4
-rw-r--r--sys/arch/hp300/stand/installboot/Makefile4
-rw-r--r--sys/arch/hp300/stand/mkboot/Makefile4
-rw-r--r--sys/arch/i386/isa/pcvt/Util/cursor/Makefile3
-rw-r--r--sys/arch/i386/isa/pcvt/Util/demo/Makefile2
-rw-r--r--sys/arch/i386/isa/pcvt/Util/fed/Makefile2
-rw-r--r--sys/arch/i386/isa/pcvt/Util/fontedit/Makefile2
-rw-r--r--sys/arch/i386/isa/pcvt/Util/ispcvt/Makefile2
-rw-r--r--sys/arch/i386/isa/pcvt/Util/kbdio/Makefile6
-rw-r--r--sys/arch/i386/isa/pcvt/Util/kcon/Makefile2
-rw-r--r--sys/arch/i386/isa/pcvt/Util/keycap/Makefile2
-rw-r--r--sys/arch/i386/isa/pcvt/Util/loadfont/Makefile2
-rw-r--r--sys/arch/i386/isa/pcvt/Util/mcon/Makefile2
-rw-r--r--sys/arch/i386/isa/pcvt/Util/scon/Makefile2
-rw-r--r--sys/arch/i386/isa/pcvt/Util/set2061/Makefile2
-rw-r--r--sys/arch/i386/isa/pcvt/Util/userkeys/Makefile2
-rw-r--r--sys/arch/i386/isa/pcvt/Util/vgaio/Makefile2
-rw-r--r--sys/arch/i386/isa/pcvt/Util/vttest/Makefile2
-rw-r--r--sys/arch/i386/stand/biosboot/Makefile4
-rw-r--r--sys/arch/i386/stand/dosboot/Makefile4
-rw-r--r--sys/arch/i386/stand/genprom/Makefile4
-rw-r--r--sys/arch/i386/stand/lib/Makefile6
-rw-r--r--sys/arch/i386/stand/netboot/Makefile4
-rw-r--r--sys/arch/macppc/stand/bootxx/Makefile4
-rw-r--r--sys/arch/macppc/stand/installboot/Makefile4
-rw-r--r--sys/arch/macppc/stand/ofwboot/Makefile4
-rw-r--r--sys/arch/mvme68k/stand/installboot/Makefile4
-rw-r--r--sys/arch/mvme68k/stand/libbug/Makefile6
-rw-r--r--sys/arch/mvme68k/stand/libsa/Makefile6
-rw-r--r--sys/arch/mvme68k/stand/prtvid/Makefile4
-rw-r--r--sys/arch/mvme68k/stand/sboot/Makefile4
-rw-r--r--sys/arch/mvme68k/stand/wrtvid/Makefile4
-rw-r--r--sys/arch/next68k/stand/boot/Makefile4
-rw-r--r--sys/arch/ofppc/stand/ofwboot/Makefile4
-rw-r--r--sys/arch/pc532/stand/Makefile.buildboot4
-rw-r--r--sys/arch/pmax/stand/libsa/Makefile8
-rw-r--r--sys/arch/pmax/stand/scsiboot/Makefile4
-rw-r--r--sys/arch/sparc/stand/Makefile.buildboot4
-rw-r--r--sys/arch/sparc/stand/binstall/Makefile4
-rw-r--r--sys/arch/sparc/stand/installboot/Makefile4
-rw-r--r--sys/arch/sparc64/stand/bootblk/Makefile4
-rw-r--r--sys/arch/sparc64/stand/installboot/Makefile4
-rw-r--r--sys/arch/sparc64/stand/ofwboot/Makefile4
-rw-r--r--sys/arch/sun3/stand/installboot/Makefile4
-rw-r--r--sys/arch/sun3/stand/libsa/Makefile8
-rw-r--r--sys/arch/x68k/stand/libdos/Makefile8
-rw-r--r--sys/arch/x68k/stand/libiocs/Makefile8
-rw-r--r--sys/arch/x68k/stand/loadbsd/Makefile4
-rw-r--r--sys/arch/x68k/stand/xxboot/Makefile4
-rw-r--r--sys/arch/x68k/stand/xxboot/gunzip/Makefile.test4
-rw-r--r--sys/arch/x68k/usr.bin/bellctrl/Makefile6
-rw-r--r--sys/arch/x68k/usr.bin/loadfont/Makefile4
-rw-r--r--sys/arch/x68k/usr.bin/loadkmap/Makefile4
-rw-r--r--sys/arch/x68k/usr.bin/palette/Makefile4
-rw-r--r--sys/arch/x68k/usr.bin/rtcalarm/Makefile4
-rw-r--r--sys/arch/x68k/usr.bin/tvctrl/Makefile4
-rw-r--r--sys/arch/x68k/usr.sbin/poffd/Makefile4
-rw-r--r--sys/compat/common/Makefile4
-rw-r--r--sys/lib/libkern/Makefile4
-rw-r--r--sys/lib/libsa/Makefile6
-rw-r--r--sys/lib/libz/Makefile6
-rw-r--r--sys/lkm/compat/freebsd/Makefile4
-rw-r--r--sys/lkm/compat/linux/Makefile4
-rw-r--r--sys/lkm/compat/sunos/Makefile4
-rw-r--r--sys/lkm/compat/svr4/Makefile4
-rw-r--r--sys/lkm/vfs/adosfs/Makefile4
-rw-r--r--sys/lkm/vfs/coda/Makefile4
-rw-r--r--sys/lkm/vfs/isofs/cd9660/Makefile4
-rw-r--r--sys/lkm/vfs/miscfs/fdesc/Makefile4
-rw-r--r--sys/lkm/vfs/miscfs/kernfs/Makefile4
-rw-r--r--sys/lkm/vfs/miscfs/nullfs/Makefile4
-rw-r--r--sys/lkm/vfs/miscfs/portal/Makefile4
-rw-r--r--sys/lkm/vfs/miscfs/procfs/Makefile4
-rw-r--r--sys/lkm/vfs/miscfs/umapfs/Makefile4
-rw-r--r--sys/lkm/vfs/miscfs/union/Makefile4
-rw-r--r--sys/lkm/vfs/msdosfs/Makefile4
-rw-r--r--sys/lkm/vfs/ufs/ext2fs/Makefile4
-rw-r--r--sys/lkm/vfs/ufs/ffs/Makefile4
-rw-r--r--sys/lkm/vfs/ufs/lfs/Makefile4
-rw-r--r--sys/lkm/vfs/ufs/mfs/Makefile4
-rw-r--r--sys/netiso/xebec/Makefile4
-rw-r--r--usr.bin/calendar/Makefile6
-rw-r--r--usr.bin/crunch/examples/Makefile4
-rw-r--r--usr.bin/dirname/Makefile4
-rw-r--r--usr.bin/file/Makefile8
-rw-r--r--usr.bin/gencat/Makefile4
-rw-r--r--usr.bin/locate/bigram/Makefile4
-rw-r--r--usr.bin/locate/code/Makefile4
-rw-r--r--usr.bin/mail/Makefile6
-rw-r--r--usr.bin/menuc/Makefile6
-rw-r--r--usr.bin/menuc/testm/Makefile4
-rw-r--r--usr.bin/msgc/Makefile6
-rw-r--r--usr.bin/tn3270/tools/Makefile.inc4
-rw-r--r--usr.bin/unexpand/Makefile4
-rw-r--r--usr.bin/units/Makefile6
-rw-r--r--usr.bin/usbhidctl/Makefile6
-rw-r--r--usr.bin/uudecode/Makefile4
-rw-r--r--usr.bin/vgrind/Makefile8
-rw-r--r--usr.bin/vgrind/RETEST/Makefile4
-rw-r--r--usr.bin/vi/build/Makefile6
-rw-r--r--usr.bin/xlint/lint1/Makefile4
-rw-r--r--usr.bin/xlint/lint2/Makefile4
-rw-r--r--usr.sbin/Makefile4
-rw-r--r--usr.sbin/amd/Makefile.inc4
-rw-r--r--usr.sbin/amd/libamu/Makefile4
-rw-r--r--usr.sbin/bind/lib/Makefile8
-rw-r--r--usr.sbin/bind/nsupdate/Makefile4
-rw-r--r--usr.sbin/bootp/bootpgw/Makefile4
-rw-r--r--usr.sbin/bootp/common/Makefile6
-rw-r--r--usr.sbin/dhcp/common/Makefile4
-rw-r--r--usr.sbin/gspa/gspa/Makefile4
-rw-r--r--usr.sbin/gspa/gspahextoc/Makefile4
-rw-r--r--usr.sbin/hilinfo/Makefile6
-rw-r--r--usr.sbin/ipf/rules/Makefile6
-rw-r--r--usr.sbin/lpr/common_source/Makefile6
-rw-r--r--usr.sbin/lpr/filters/Makefile4
-rw-r--r--usr.sbin/mopd/common/Makefile6
-rw-r--r--usr.sbin/named/nslookup/Makefile4
-rw-r--r--usr.sbin/pkg_install/lib/Makefile8
-rw-r--r--usr.sbin/rpc.pcnfsd/Makefile.clnt4
-rw-r--r--usr.sbin/sendmail/Makefile6
-rw-r--r--usr.sbin/sendmail/cf/Makefile4
-rw-r--r--usr.sbin/sendmail/src/Makefile6
-rw-r--r--usr.sbin/sup/lib/Makefile6
-rw-r--r--usr.sbin/sup/supscan/Makefile4
-rw-r--r--usr.sbin/videomode/Makefile6
-rw-r--r--usr.sbin/ypserv/common/Makefile6
293 files changed, 743 insertions, 670 deletions
diff --git a/Makefile b/Makefile
index 2880e0d9e90..3f0eaaf2e2c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.85 1999/02/11 17:56:46 tv Exp $
+# $NetBSD: Makefile,v 1.86 1999/02/13 02:54:17 lukem Exp $
.include <bsd.own.mk> # for configuration variables.
# Configurations variables (can be set either in /etc/mk.conf or
# as environement variable
-# NBUILDJOBS: the number of jobs to start in parallel in a 'make build'.
-# defaults to 1
-# NOMAN: if set to 1, don't build and install man pages
-# NOSHARE: if set to 1, don't build or install /usr/share stuffs
-# UPDATE: if set to 1, don't do a 'make cleandir' before compile
-# DESTDIR: The target directory for installation (default to '/',
-# which mean the current system is updated).
+# NBUILDJOBS: the number of jobs to start in parallel in a 'make build'.
+# defaults to 1
+# MKMAN: if set to no, don't build and install man pages
+# MKSHARE: if set to no, don't build or install /usr/share stuffs
+# UPDATE: if set to 1, don't do a 'make cleandir' before compile
+# DESTDIR: The target directory for installation (default to '/',
+# which mean the current system is updated).
HAVE_GCC28!= ${CXX} --version | egrep "^(2\.8|egcs)" ; echo
@@ -65,7 +65,7 @@ beforeinstall:
.endif
afterinstall:
-.if !defined(NOMAN) && !defined(NOSHARE) && !defined(_BUILD)
+.if ${MKMAN} != "no" && !defined(_BUILD)
${MAKE} whatis.db
.endif
@@ -76,7 +76,7 @@ whatis.db:
# as the build will automatically remove/replace the non-pkg entries there.
build: beforeinstall
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
(cd ${.CURDIR}/share/mk && ${MAKE} install)
(cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install)
.endif
@@ -91,20 +91,24 @@ build: beforeinstall
@false
.else
(cd ${.CURDIR}/gnu/usr.bin/egcs && \
- ${MAKE} depend && ${MAKE} ${_J} NOMAN= && \
- ${MAKE} NOMAN= install && ${MAKE} cleandir)
+ ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \
+ ${MAKE} MKMAN=no install && ${MAKE} cleandir)
.endif
.endif
${MAKE} _BUILD= includes
(cd ${.CURDIR}/lib/csu && \
- ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install)
+ ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \
+ ${MAKE} MKMAN=no install)
(cd ${.CURDIR}/lib && \
- ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install)
+ ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \
+ ${MAKE} MKMAN=no install)
(cd ${.CURDIR}/gnu/lib && \
- ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install)
+ ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \
+ ${MAKE} MKMAN=no install)
.if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
(cd ${.CURDIR}/domestic/lib && \
- ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install)
+ ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \
+ ${MAKE} MKMAN=no install)
.endif
${MAKE} depend && ${MAKE} ${_J} && ${MAKE} _BUILD= install
.if exists(domestic) && !defined(EXPORTABLE_SYSTEM)
diff --git a/distrib/utils/init_s/Makefile b/distrib/utils/init_s/Makefile
index 98b1fda6d9a..baa062fe2c8 100644
--- a/distrib/utils/init_s/Makefile
+++ b/distrib/utils/init_s/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 1997/10/22 01:42:36 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:18 lukem Exp $
# Build a "small init" (i.e. for boot media)
PROG= init
-NOMAN=
+MKMAN= no
# Need -lutil for: logout, logwtmp, login_tty
DPADD= ${LIBUTIL}
diff --git a/distrib/utils/libhack/Makefile b/distrib/utils/libhack/Makefile
index 5a881f00ec7..530ba6f9ef4 100644
--- a/distrib/utils/libhack/Makefile
+++ b/distrib/utils/libhack/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.4 1997/12/12 03:36:38 gwr Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:18 lukem Exp $
#
# Stubs to kill off some things from libc:
# This save space on a boot system.
# (See Makefile.inc also.)
LIB= hack
-SRCS= getgrent.c gethost.c getnet.c getnetgr.c getpwent.c \
- setlocale.c yplib.c
+SRCS= getgrent.c gethost.c getnet.c getnetgr.c getpwent.c setlocale.c yplib.c
-NOPIC=
-NOPROFILE=
+MKPIC= no
+MKPROFILE=no
all: libhack.a
diff --git a/distrib/utils/more/Makefile b/distrib/utils/more/Makefile
index 17c45e03dca..ac5f3c0706f 100644
--- a/distrib/utils/more/Makefile
+++ b/distrib/utils/more/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 1998/04/13 14:10:05 lukem Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:18 lukem Exp $
#
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-WARNS?=1
PROG= more
-NOMAN=1
+MKMAN= no
CPPFLAGS+=-I${.CURDIR}
SRCS= ch.c command.c decode.c help.c input.c line.c linenum.c main.c \
diff --git a/distrib/utils/ssh/Makefile b/distrib/utils/ssh/Makefile
index 98bf174717e..e822ebd514c 100644
--- a/distrib/utils/ssh/Makefile
+++ b/distrib/utils/ssh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 1995/10/08 23:08:46 gwr Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:18 lukem Exp $
# Small Shell (i.e. for boot media)
PROG= ssh
-NOMAN=
+MKMAN= no
all: ${PROG}
diff --git a/distrib/utils/sysinst/Makefile.inc b/distrib/utils/sysinst/Makefile.inc
index aa6b8e30607..c8c40e1933d 100644
--- a/distrib/utils/sysinst/Makefile.inc
+++ b/distrib/utils/sysinst/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 1997/10/22 02:17:22 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.4 1999/02/13 02:54:18 lukem Exp $
#
# Makefile for install
@@ -17,7 +17,7 @@ VER != sh ${.CURDIR}/../../../../../sys/conf/osrelease.sh
CPPFLAGS+= -I. -I${.CURDIR}/../.. -I${.CURDIR} \
-DREL=\"${VER}\" -DMACH=\"${MACHINE}\"
-NOMAN=y
+MKMAN=no
WARNS=1
diff --git a/distrib/utils/tls/Makefile b/distrib/utils/tls/Makefile
index b91891dbdc2..440bd630f1c 100644
--- a/distrib/utils/tls/Makefile
+++ b/distrib/utils/tls/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 1995/10/08 23:08:47 gwr Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:18 lukem Exp $
# Tiny ls (i.e. for boot media)
PROG= tls
-NOMAN=
+MKMAN= no
all: ${PROG}
diff --git a/distrib/utils/x_dd/Makefile b/distrib/utils/x_dd/Makefile
index 9f6784f1ea2..77d5a7ae263 100644
--- a/distrib/utils/x_dd/Makefile
+++ b/distrib/utils/x_dd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 1997/10/22 02:11:56 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:19 lukem Exp $
# Build a smaller dd (i.e. for boot media)
PROG= dd
-NOMAN=
+MKMAN= no
SRCDIR= ${.CURDIR}/../../../bin/dd
diff --git a/distrib/utils/x_ftp/Makefile b/distrib/utils/x_ftp/Makefile
index 5bb02ccfc4e..34f052b75a6 100644
--- a/distrib/utils/x_ftp/Makefile
+++ b/distrib/utils/x_ftp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 1998/08/02 03:17:21 lukem Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:19 lukem Exp $
# Build a smaller ftp (i.e. for boot media)
PROG= ftp
-NOMAN=
+MKMAN= no
# Need -lutil for: fparseln
DPADD= ${LIBUTIL}
diff --git a/distrib/utils/x_ifconfig/Makefile b/distrib/utils/x_ifconfig/Makefile
index bcf37086363..87a325b896a 100644
--- a/distrib/utils/x_ifconfig/Makefile
+++ b/distrib/utils/x_ifconfig/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 1997/10/22 02:16:38 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:19 lukem Exp $
# Build a smaller ifconfig (i.e. for boot media)
PROG= ifconfig
-NOMAN=
+MKMAN= no
SRCDIR= ${.CURDIR}/../../../sbin/ifconfig
CPPFLAGS+= -DINET_ONLY -I${SRCDIR}
diff --git a/distrib/utils/x_netstat/Makefile b/distrib/utils/x_netstat/Makefile
index 3baeb702e68..e259d1cdd89 100644
--- a/distrib/utils/x_netstat/Makefile
+++ b/distrib/utils/x_netstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1999/01/10 13:50:35 mrg Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:19 lukem Exp $
PROG= netstat
SRCS= if.c inet.c main.c mbuf.c route.c
@@ -7,7 +7,7 @@ SRCDIR= ${.CURDIR}/../../../usr.bin/netstat
CPPFLAGS+= -DSMALL -I${SRCDIR}
LDADD= -lkvm
DPADD= ${LIBKVM}
-NOMAN=
+MKMAN= no
BINOWN= root
BINMODE=4555
diff --git a/distrib/utils/x_route/Makefile b/distrib/utils/x_route/Makefile
index 71e8cd218ca..4f957bae1fc 100644
--- a/distrib/utils/x_route/Makefile
+++ b/distrib/utils/x_route/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 1997/10/22 02:20:09 lukem Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:19 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
PROG= route
-NOMAN=
+MKMAN= no
SRCS= route.c show.c keywords.c
SRCDIR= ${.CURDIR}/../../../sbin/route
diff --git a/distrib/utils/x_sh/Makefile b/distrib/utils/x_sh/Makefile
index 55eb0279391..b2f46f5d67b 100644
--- a/distrib/utils/x_sh/Makefile
+++ b/distrib/utils/x_sh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/10/08 01:08:24 ross Exp $
+# $NetBSD: Makefile,v 1.8 1999/02/13 02:54:19 lukem Exp $
# Build a smaller sh (e.g. for boot media)
#
# Be very careful before attempting to "clean up" the ugly location
@@ -11,10 +11,10 @@
# of BSDSRCDIR can be deleted here, and so I didn't want to depend on it
# in case someday we completely nuke the rarely used BSDSRCDIR.
-NOMAN=1
-
.include <bsd.own.mk>
+MKMAN=no
+
.for i in ../../bin/sh \
../../../bin/sh \
../../../../bin/sh
diff --git a/distrib/utils/zcat/Makefile b/distrib/utils/zcat/Makefile
index 0f2ac55a437..b05bcdfe3c7 100644
--- a/distrib/utils/zcat/Makefile
+++ b/distrib/utils/zcat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1997/10/22 02:26:44 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:19 lukem Exp $
# Small zcat (i.e. for install media)
#
# Note: gzio.c is compiled here so that crunchgen will assume
@@ -7,7 +7,7 @@
# references to those functions in gzio.c (yes, it's a hack).
PROG= zcat
-NOMAN=
+MKMAN= no
SRCS= zcat.c gzio.c
SRCDIR= ${.CURDIR}/../../../lib/libz
diff --git a/etc/Makefile b/etc/Makefile
index 7eb38a48702..fe4458e748f 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 1999/02/11 22:48:11 cjs Exp $
+# $NetBSD: Makefile,v 1.101 1999/02/13 02:54:19 lukem Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -42,7 +42,7 @@ LOCALTIME?= US/Pacific
# setting NOOBJ prevents "make obj" from doing anything;
# an objdir would break the installation stuff below
-NOOBJ= oobj
+MKOBJ= no
# MD Makefile.inc may append MD targets to BIN[123]. Make sure all
# are empty, to preserve the old semantics of setting them below with "=".
diff --git a/games/atc/Makefile b/games/atc/Makefile
index f4255ceb148..eb3a28d390f 100644
--- a/games/atc/Makefile
+++ b/games/atc/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.20 1998/09/29 07:33:20 lukem Exp $
+# $NetBSD: Makefile,v 1.21 1999/02/13 02:54:20 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
+.include <bsd.own.mk>
+
PROG= atc
CPPFLAGS+=-DBSD -I${.CURDIR} -I. -DYY_NO_UNPUT
SRCS= extern.c grammar.y graphics.c input.c lex.l list.c log.c \
@@ -14,7 +16,7 @@ GAMES= Game_List Killer crossover default easy game_2 \
game_4 novice two-corners
HIDEGAME=hidegame
SETGIDGAME=yes
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES=${GAMES:S@^@${.CURDIR}/games/@g}
FILESDIR=/usr/share/games/atc
FILESMODE=440
diff --git a/games/backgammon/common_source/Makefile b/games/backgammon/common_source/Makefile
index 2a4059bd9b9..7102b83422d 100644
--- a/games/backgammon/common_source/Makefile
+++ b/games/backgammon/common_source/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 1997/10/11 20:24:06 mycroft Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:20 lukem Exp $
LIB= common
SRCS= allow.c board.c check.c fancy.c init.c odds.c one.c save.c subs.c \
table.c
-NOPROFILE= noprofile
-NOPIC= nopic
+MKPROFILE=no
+MKPIC= no
# only needed during build
libinstall::
diff --git a/games/backgammon/teachgammon/Makefile b/games/backgammon/teachgammon/Makefile
index cd53994f6fc..249e506c6bb 100644
--- a/games/backgammon/teachgammon/Makefile
+++ b/games/backgammon/teachgammon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 1997/10/10 08:59:50 lukem Exp $
+# $NetBSD: Makefile,v 1.9 1999/02/13 02:54:20 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= teachgammon
SRCS= data.c teach.c ttext1.c ttext2.c tutor.c
-NOMAN= noman
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/games/boggle/Makefile b/games/boggle/Makefile
index 2692998764c..75745bfe950 100644
--- a/games/boggle/Makefile
+++ b/games/boggle/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.14 1998/11/09 15:30:10 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 1999/02/13 02:54:20 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/11/93
+.include <bsd.own.mk>
+
SUBDIR= boggle mkdict mkindex
MKDICT!=cd $(.CURDIR)/mkdict; \
@@ -9,7 +11,7 @@ MKINDEX!=cd $(.CURDIR)/mkindex; \
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/mkindex\n" | ${MAKE} -s -f-
WORDS=${.CURDIR}/../../share/dict/web2
DICTFILES=${.OBJDIR}/dictionary ${.OBJDIR}/dictindex
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES=${DICTFILES}
FILESDIR=/usr/share/games/boggle
.endif
diff --git a/games/boggle/boggle/Makefile b/games/boggle/boggle/Makefile
index f07c939cc45..3ea5298815d 100644
--- a/games/boggle/boggle/Makefile
+++ b/games/boggle/boggle/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.8 1998/09/29 07:33:21 lukem Exp $
+# $NetBSD: Makefile,v 1.9 1999/02/13 02:54:20 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/11/93
+.include <bsd.own.mk>
+
PROG= boggle
SRCS= bog.c help.c mach.c prtable.c timer.c word.c
DPADD= ${LIBCURSES}
LDADD= -lcurses
HIDEGAME=hidegame
MAN= boggle.6
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES= helpfile
FILESDIR=/usr/share/games/boggle
.endif
diff --git a/games/boggle/mkdict/Makefile b/games/boggle/mkdict/Makefile
index 5b3f764b28a..8d391479a1a 100644
--- a/games/boggle/mkdict/Makefile
+++ b/games/boggle/mkdict/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 1998/04/13 14:14:39 lukem Exp $
+# $NetBSD: Makefile,v 1.9 1999/02/13 02:54:20 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/11/93
PROG= mkdict
HOST_CPPFLAGS+=-I${.CURDIR}/../boggle
-NOMAN= noman
+MKMAN= no
# XXX for "make depend"
CPPFLAGS+=-I${.CURDIR}/../boggle
diff --git a/games/boggle/mkindex/Makefile b/games/boggle/mkindex/Makefile
index 448e7952c6d..4944a8da1f8 100644
--- a/games/boggle/mkindex/Makefile
+++ b/games/boggle/mkindex/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 1998/04/13 14:14:39 lukem Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:20 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/11/93
PROG= mkindex
HOST_CPPFLAGS+=-I${.CURDIR}/../boggle
-NOMAN= noman
+MKMAN= no
# XXX for "make depend"
CPPFLAGS+=-I${.CURDIR}/../boggle
diff --git a/games/canfield/cfscores/Makefile b/games/canfield/cfscores/Makefile
index 60d6057889b..f5205981dd7 100644
--- a/games/canfield/cfscores/Makefile
+++ b/games/canfield/cfscores/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 1997/10/22 04:42:45 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:21 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= cfscores
CPPFLAGS+=-I${.CURDIR}/../canfield
-NOMAN= noman
+MKMAN= no
HIDEGAME=hidegame
.include "../../Makefile.inc"
diff --git a/games/cribbage/Makefile b/games/cribbage/Makefile
index aeaa7d43e21..537e0ea4b8e 100644
--- a/games/cribbage/Makefile
+++ b/games/cribbage/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.11 1998/09/29 07:33:21 lukem Exp $
+# $NetBSD: Makefile,v 1.12 1999/02/13 02:54:21 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
+.include <bsd.own.mk>
+
PROG= cribbage
DPADD= ${LIBCURSES}
LDADD= -lcurses
@@ -8,7 +10,7 @@ SRCS= extern.c crib.c cards.c instr.c io.c score.c support.c
MAN= cribbage.6
HIDEGAME=hidegame
SETGIDGAME=yes
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES= cribbage.n
FILESNAME=cribbage.instr
FILESDIR=/usr/share/games
diff --git a/games/fish/Makefile b/games/fish/Makefile
index 0a53dd4a476..854bd568be3 100644
--- a/games/fish/Makefile
+++ b/games/fish/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.9 1998/09/29 07:33:21 lukem Exp $
+# $NetBSD: Makefile,v 1.10 1999/02/13 02:54:21 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
+.include <bsd.own.mk>
+
PROG= fish
MAN= fish.6
HIDEGAME=hidegame
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES=fish.instr
FILESDIR=/usr/share/games
.endif
diff --git a/games/fortune/datfiles/Makefile b/games/fortune/datfiles/Makefile
index 1817cf04652..520b23c968b 100644
--- a/games/fortune/datfiles/Makefile
+++ b/games/fortune/datfiles/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 1998/09/29 07:33:21 lukem Exp $
+# $NetBSD: Makefile,v 1.22 1999/02/13 02:54:21 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 4/19/94
.include <bsd.own.mk> # for INSTALL_OFFENSIVE_FORTUNES
@@ -24,7 +24,7 @@ CLEANFILES+=${DATFILES}
STRFILE!=cd $(.CURDIR)/../strfile; \
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/strfile\n" | ${MAKE} -s -f-
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES=${SRCFILES} ${DATFILES}
FILESDIR=/usr/share/games/fortune
.endif
diff --git a/games/fortune/unstr/Makefile b/games/fortune/unstr/Makefile
index edaf5acec97..e2a00a192cb 100644
--- a/games/fortune/unstr/Makefile
+++ b/games/fortune/unstr/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 1997/10/22 04:56:21 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:21 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= unstr
-NOMAN= noman
+MKMAN= no
CPPFLAGS+= -I${.CURDIR}/../strfile
.include <bsd.prog.mk>
diff --git a/games/larn/Makefile b/games/larn/Makefile
index f9bb3ac8869..ca5469a9b7d 100644
--- a/games/larn/Makefile
+++ b/games/larn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/09/29 07:33:21 lukem Exp $
+# $NetBSD: Makefile,v 1.16 1999/02/13 02:54:21 lukem Exp $
# @(#)Makefile 5.12 (Berkeley) 5/30/93
# EXTRA
@@ -55,6 +55,8 @@
# NOLOG
# Turn off logging.
+.include <bsd.own.mk>
+
PROG= larn
MAN= larn.6
CPPFLAGS+=-DBSD -DVER=12 -DSUBVER=0 -DNONAP -DUIDSCORE -DTERMIOS
@@ -65,7 +67,7 @@ DPADD= ${LIBTERM}
LDADD= -ltermcap
HIDEGAME=hidegame
SETGIDGAME=yes
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
DAT=larnmaze larnopts larn.help
FILES=${DAT:S@^@${.CURDIR}/datfiles/@g}
FILESDIR=/usr/share/games/larn
diff --git a/games/monop/Makefile b/games/monop/Makefile
index 29376c64b63..70bdbc4fcb7 100644
--- a/games/monop/Makefile
+++ b/games/monop/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.19 1998/09/29 07:33:21 lukem Exp $
+# $NetBSD: Makefile,v 1.20 1999/02/13 02:54:21 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
+.include <bsd.own.mk>
+
PROG= monop
SRCS= monop.c cards.c execute.c getinp.c houses.c jail.c misc.c morg.c \
print.c prop.c rent.c roll.c spec.c trade.c
MAN= monop.6
HIDEGAME=hidegame
CLEANFILES+=initdeck cards.pck
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES=cards.pck
FILESDIR=/usr/share/games
.endif
diff --git a/games/morse/Makefile b/games/morse/Makefile
index 0f28e4f8b3c..967dda40a38 100644
--- a/games/morse/Makefile
+++ b/games/morse/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 1995/03/23 08:35:22 cgd Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:21 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= morse
-NOMAN= noman
+MKMAN= no
HIDEGAME=hidegame
.include <bsd.prog.mk>
diff --git a/games/ppt/Makefile b/games/ppt/Makefile
index 580a7c1a911..f551b0acf84 100644
--- a/games/ppt/Makefile
+++ b/games/ppt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 1995/03/23 08:35:38 cgd Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:22 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= ppt
-NOMAN= noman
+MKMAN= no
HIDEGAME=hidegame
.include <bsd.prog.mk>
diff --git a/games/primes/Makefile b/games/primes/Makefile
index 0a6747f14cb..72627b8cfc2 100644
--- a/games/primes/Makefile
+++ b/games/primes/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 1995/03/23 08:35:43 cgd Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:22 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= primes
SRCS= pattern.c pr_tbl.c primes.c
-NOMAN= noman
+MKMAN= no
DPADD= ${LIBM}
LDADD= -lm
diff --git a/games/quiz/Makefile b/games/quiz/Makefile
index 87bf1ccb133..3832ad439df 100644
--- a/games/quiz/Makefile
+++ b/games/quiz/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.12 1998/09/29 07:33:22 lukem Exp $
+# $NetBSD: Makefile,v 1.13 1999/02/13 02:54:22 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
+.include <bsd.own.mk>
+
PROG= quiz
MAN= quiz.6
SRCS= quiz.c rxp.c
HIDEGAME=hidegame
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
CATS= africa america areas arith asia babies bard chinese collectives \
ed elements europe flowers greek inca index latin locomotive \
midearth morse mult murders poetry posneg pres province seq-easy \
diff --git a/games/snake/snscore/Makefile b/games/snake/snscore/Makefile
index 7e9fe3d5c39..6401dc3d12b 100644
--- a/games/snake/snscore/Makefile
+++ b/games/snake/snscore/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 1997/10/22 05:26:25 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:22 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= snscore
CPPFLAGS+=-I${.CURDIR}/../snake
-NOMAN= noman
+MKMAN= no
HIDEGAME=hidegame
.include "../../Makefile.inc"
diff --git a/games/wargames/Makefile b/games/wargames/Makefile
index 5ed35f6addf..0698cf01b5e 100644
--- a/games/wargames/Makefile
+++ b/games/wargames/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 1997/05/09 07:50:06 mycroft Exp $
+# $NetBSD: Makefile,v 1.8 1999/02/13 02:54:22 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-NOOBJ= noobj
+MKOBJ= no
SCRIPTS=wargames.sh
.include <bsd.prog.mk>
diff --git a/games/wump/Makefile b/games/wump/Makefile
index ad950455178..54460787077 100644
--- a/games/wump/Makefile
+++ b/games/wump/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.7 1998/09/29 07:33:22 lukem Exp $
+# $NetBSD: Makefile,v 1.8 1999/02/13 02:54:22 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
+.include <bsd.own.mk>
+
PROG= wump
MAN= wump.6
HIDEGAME=hidegame
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES=wump.info
FILESDIR=/usr/share/games
.endif
diff --git a/gnu/games/chess/Makefile b/gnu/games/chess/Makefile
index 22fa240ca70..949b2be25aa 100644
--- a/gnu/games/chess/Makefile
+++ b/gnu/games/chess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1998/09/27 17:22:03 lukem Exp $
+# $NetBSD: Makefile,v 1.17 1999/02/13 02:54:22 lukem Exp $
# from: @(#)Makefile 5.4 (Berkeley) 5/11/90
PROG= chess
@@ -7,7 +7,7 @@ CPPFLAGS+=-DNEWMOVE=12
DPADD= ${LIBCURSES} ${LIBGNUMALLOC}
LDADD= -lcurses -lgnumalloc
HIDEGAME=hidegame
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES=gnuchess.book
FILESDIR=/usr/share/games
.endif
diff --git a/gnu/lib/libbfd/Makefile b/gnu/lib/libbfd/Makefile
index d901a78094f..720931f1588 100644
--- a/gnu/lib/libbfd/Makefile
+++ b/gnu/lib/libbfd/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.3 1999/02/11 17:37:34 tv Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:22 lukem Exp $
LIB= bfd
-NOLINT= nolint (GNU source)
-NOMAN=
-NOPROFILE=
-NOLINKLIB=
+MKLINT= no
+MKMAN= no
+MKPROFILE= no
+MKLINKLIB= no
-# for NOPIC, BFD_SLIM, BFD_UNIFIED
+# for MKPIC, BFD_SLIM, BFD_UNIFIED
.include <bsd.own.mk>
# XXX BFD_UNIFIED should go away if benchmarking shows minor to no difference
-.if defined(NOPIC) || !defined(BFD_UNIFIED)
+.if ${MKPIC} == "no" || !defined(BFD_UNIFIED)
BFD_SLIM=
.endif
diff --git a/gnu/lib/libg2c/Makefile b/gnu/lib/libg2c/Makefile
index 4623095d50b..b4157b61a22 100644
--- a/gnu/lib/libg2c/Makefile
+++ b/gnu/lib/libg2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/10/20 18:11:04 matt Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:23 lukem Exp $
LIB= g2c
@@ -62,7 +62,7 @@ POBJS+= ${E77OBJS:.o=.po}
CLEANFILES+= ${LIBF77SRCS}
DPSRCS+= g2c.h
-NOLINT= nolint (FORTRAN runtime)
+MKLINT= no
CPPFLAGS+= -I. -I${.CURDIR} -I${ARCH} -I${ARCH}/${MACHINE_ARCH} \
-I${DIST}/libf2c -I${DIST}/libf2c/libF77 \
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index c9c21207497..3691dd3c47f 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 1998/11/23 09:29:56 mrg Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:23 lukem Exp $
HAVE_GCC28!= ${CXX} --version | egrep "^(2\.8|egcs)" ; echo
LIB= gcc
-NOLINT= nolint (gcc private fns library)
-NOPROFILE=
-NOPIC=
+MKLINT= no
+MKPROFILE= no
+MKPIC= no
DIST= ${.CURDIR}/../../dist/gcc
ARCH= ${.CURDIR}/../../usr.bin/egcs/arch
diff --git a/gnu/lib/libmalloc/Makefile b/gnu/lib/libmalloc/Makefile
index e7d76022236..898693864f3 100644
--- a/gnu/lib/libmalloc/Makefile
+++ b/gnu/lib/libmalloc/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1997/10/25 09:27:35 lukem Exp $
+# $Id: Makefile,v 1.4 1999/02/13 02:54:23 lukem Exp $
CPPFLAGS+= -I${.CURDIR}
@@ -8,6 +8,6 @@ SRCS+= combined.c
SRCS+= cfree.c calloc.c morecore.c
SRCS+= memalign.c valloc.c mcheck.c mtrace.c mstats.c vm-limit.c
SRCS+= ralloc.c
-NOMAN= noman
+MKMAN= no
.include <bsd.lib.mk>
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile
index fdff9f4353d..d5004b3a9b5 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/08/28 22:36:56 tv Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:23 lukem Exp $
HAVE_GCC28!= ${CXX} --version | egrep "^(2\.8|egcs)" ; echo
@@ -18,7 +18,7 @@ INCSDIR= /usr/include/objc
CPPFLAGS+= -I. -I${ARCH}/${MACHINE_ARCH} -I${ARCH} \
-I${DIST}/config -I${DIST}
-NOLINT= nolint (Objective-C)
+MKLINT= no
DIST= ${.CURDIR}/../../dist/gcc
ARCH= ${.CURDIR}/../../usr.bin/egcs/arch
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index 1fb450ce87f..e950af36bd0 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/02/11 17:30:46 tv Exp $
+# $NetBSD: Makefile,v 1.9 1999/02/13 02:54:23 lukem Exp $
LIB= stdc++
@@ -30,8 +30,8 @@ SRCS= PlotFile.cc SFile.cc builtinbuf.cc editbuf.cc filebuf.cc fstream.cc \
DIST= ${.CURDIR}/../../dist
CPPFLAGS+= -I${DESTDIR}/usr/include/g++ -I${DIST}/libstdc++
-NOMAN=
-NOLINT= nolint (c++)
+MKMAN= no
+MKLINT= no
TEXINFO= iostream.texi
diff --git a/gnu/libexec/uucp/libunix/Makefile b/gnu/libexec/uucp/libunix/Makefile
index c2bdac19818..975523b8a2c 100644
--- a/gnu/libexec/uucp/libunix/Makefile
+++ b/gnu/libexec/uucp/libunix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1998/02/19 02:17:06 cgd Exp $
+# $NetBSD: Makefile,v 1.12 1999/02/13 02:54:23 lukem Exp $
#
# This subdirectory contains Unix specific support functions.
@@ -16,10 +16,10 @@ SRCS= access.c addbas.c app3.c app4.c basnam.c bytfre.c cwd.c \
CPPFLAGS+= -I$(.CURDIR)/../common_sources \
-DOWNER=\"$(owner)\" -DSBINDIR=\"$(sbindir)\"
-NOMAN= noman
-NOPROFILE= noprofile
-NOPIC= nopic
-NOLINT= nolint (XXX lint bugs)
+MKMAN= no
+MKPROFILE= no
+MKPIC= no
+MKLINT= no
# only needed during build
libinstall::
diff --git a/gnu/libexec/uucp/libuuconf/Makefile b/gnu/libexec/uucp/libuuconf/Makefile
index f1a5fa6a10a..6abe20a59ae 100644
--- a/gnu/libexec/uucp/libuuconf/Makefile
+++ b/gnu/libexec/uucp/libuuconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1997/10/25 09:31:37 lukem Exp $
+# $NetBSD: Makefile,v 1.11 1999/02/13 02:54:23 lukem Exp $
#
# This is the Makefile for the Taylor UUCP uuconf library
@@ -20,9 +20,9 @@ CPPFLAGS+= -I$(.CURDIR)/../common_sources \
-DNEWCONFIGLIB=\"$(newconfigdir)\"\
-DOLDCONFIGLIB=\"$(oldconfigdir)\"
-NOMAN= noman
-NOPROFILE= noprofile
-NOPIC= nopic
+MKMAN= no
+MKPROFILE= no
+MKPIC= no
# only needed during build
libinstall::
diff --git a/gnu/libexec/uucp/libuucp/Makefile b/gnu/libexec/uucp/libuucp/Makefile
index c64a3d14e00..ec18aabc870 100644
--- a/gnu/libexec/uucp/libuucp/Makefile
+++ b/gnu/libexec/uucp/libuucp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1997/10/25 09:31:39 lukem Exp $
+# $NetBSD: Makefile,v 1.10 1999/02/13 02:54:24 lukem Exp $
#
# This is the Makefile for the libuucp subdirectory of Taylor UUCP
@@ -7,9 +7,9 @@ SRCS= buffer.c crc.c debug.c escape.c getopt.c getop1.c parse.c \
spool.c status.c xfree.c xmall.c xreall.c getlin.c
CPPFLAGS+= -I$(.CURDIR)/../common_sources
-NOMAN= noman
-NOPROFILE= noprofile
-NOPIC= nopic
+MKMAN= no
+MKPROFILE= no
+MKPIC= no
# only needed during build
libinstall::
diff --git a/gnu/libexec/uucp/uuchk/Makefile b/gnu/libexec/uucp/uuchk/Makefile
index f23abbd416b..27a6acf45b1 100644
--- a/gnu/libexec/uucp/uuchk/Makefile
+++ b/gnu/libexec/uucp/uuchk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1997/10/25 09:31:44 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:24 lukem Exp $
#
# Makefile for uuchk
@@ -12,6 +12,6 @@ DPADD+= $(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
CPPFLAGS+= -I$(.CURDIR)/../common_sources\
-DVERSION=\"$(VERSION)\"
-NOMAN= noman
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/gnu/libexec/uucp/uuconv/Makefile b/gnu/libexec/uucp/uuconv/Makefile
index c818a6eb257..3d7d86154b5 100644
--- a/gnu/libexec/uucp/uuconv/Makefile
+++ b/gnu/libexec/uucp/uuconv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1997/10/25 09:31:51 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:24 lukem Exp $
#
# Makefile for uuconv
@@ -13,6 +13,6 @@ CPPFLAGS+= -I$(.CURDIR)/../common_sources\
-I$(.CURDIR)/../libuuconf\
-DVERSION=\"$(VERSION)\"
-NOMAN= noman
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/gnu/libexec/uucp/uulog/Makefile b/gnu/libexec/uucp/uulog/Makefile
index cee976193bf..91ab67835d2 100644
--- a/gnu/libexec/uucp/uulog/Makefile
+++ b/gnu/libexec/uucp/uulog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1997/10/25 09:31:58 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:24 lukem Exp $
#
# Makefile for uulog
@@ -11,7 +11,7 @@ DPADD+= $(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
CPPFLAGS+= -I$(.CURDIR)/../common_sources\
-DVERSION=\"$(VERSION)\"
-NOMAN= noman
+MKMAN= no
.include <bsd.prog.mk>
.PATH: $(.CURDIR)/../common_sources
diff --git a/gnu/libexec/uucp/uuname/Makefile b/gnu/libexec/uucp/uuname/Makefile
index 4a5d742e6e3..49de83d05f8 100644
--- a/gnu/libexec/uucp/uuname/Makefile
+++ b/gnu/libexec/uucp/uuname/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1997/10/25 09:32:00 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:24 lukem Exp $
#
# Makefile for uuname
@@ -13,7 +13,7 @@ DPADD+= $(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
CPPFLAGS+= -I$(.CURDIR)/../common_sources\
-DVERSION=\"$(VERSION)\"
-NOMAN= noman
+MKMAN= no
.include <bsd.prog.mk>
.PATH: $(.CURDIR)/../common_sources
diff --git a/gnu/libexec/uucp/uupick/Makefile b/gnu/libexec/uucp/uupick/Makefile
index fdd450fadca..5297ed1a2b0 100644
--- a/gnu/libexec/uucp/uupick/Makefile
+++ b/gnu/libexec/uucp/uupick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1997/10/25 09:32:03 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:24 lukem Exp $
#
# Makefile for uupick
@@ -11,7 +11,7 @@ DPADD+= $(LIBUNIX) $(LIBUUCONF) $(LIBUUCP)
CPPFLAGS+= -I$(.CURDIR)/../common_sources\
-DVERSION=\"$(VERSION)\"
-NOMAN= noman
+MKMAN= no
.include <bsd.prog.mk>
.PATH: $(.CURDIR)/../common_sources
diff --git a/gnu/usr.bin/binutils/common/Makefile b/gnu/usr.bin/binutils/common/Makefile
index f7a274b6bd2..bcc7346173b 100644
--- a/gnu/usr.bin/binutils/common/Makefile
+++ b/gnu/usr.bin/binutils/common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/02/09 19:21:54 tv Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:24 lukem Exp $
LIB= common
@@ -7,9 +7,9 @@ SRCS= arparse.y arlex.l arsup.c bucomm.c version.c filemode.c \
CPPFLAGS+= -DTARGET='"${MACHINE_GNU_ARCH}--netbsd"'
YHEADER=1
-NOPROFILE=
-NOPIC=
-NOLINT=
+MKPROFILE= no
+MKPIC= no
+MKLINT= no
# only needed during build
libinstall::
diff --git a/gnu/usr.bin/egcs/Makefile.cc1 b/gnu/usr.bin/egcs/Makefile.cc1
index be136a36d21..d91fc6630b1 100644
--- a/gnu/usr.bin/egcs/Makefile.cc1
+++ b/gnu/usr.bin/egcs/Makefile.cc1
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cc1,v 1.11 1999/02/12 08:41:38 cjs Exp $
+# $NetBSD: Makefile.cc1,v 1.12 1999/02/13 02:54:25 lukem Exp $
.include <bsd.own.mk>
@@ -8,7 +8,7 @@ BINDIR= /usr/libexec
MKMAN= no
LDADD+= -L${COMMONOBJ} -lcc1
-.if defined(NOPIC)
+.if ${MKPIC} == "no"
DPADD+= ${COMMONOBJ}/libcc1.a
.else
DPADD+= ${COMMONOBJ}/libcc1_pic.a
diff --git a/gnu/usr.bin/egcs/Makefile.inc b/gnu/usr.bin/egcs/Makefile.inc
index 66ed81cf6e5..79142acf63b 100644
--- a/gnu/usr.bin/egcs/Makefile.inc
+++ b/gnu/usr.bin/egcs/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 1999/01/31 21:45:08 christos Exp $
+# $NetBSD: Makefile.inc,v 1.17 1999/02/13 02:54:25 lukem Exp $
.if !defined(GCC_MAKEFILE_INC)
GCC_MAKEFILE_INC=1
@@ -10,7 +10,7 @@ GCC_MAKEFILE_INC=1
(${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "sparc64")
USE_EGCS_HAIFA=1
.endif
-#NOMAN=1
+#MKMAN=no
# gcc has files with a "rs6000" prefix for powerpc
GNU_ARCH.powerpc=rs6000
diff --git a/gnu/usr.bin/egcs/collect2/Makefile b/gnu/usr.bin/egcs/collect2/Makefile
index 3b075d85622..6c4fdcd0c8d 100644
--- a/gnu/usr.bin/egcs/collect2/Makefile
+++ b/gnu/usr.bin/egcs/collect2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/08/17 15:46:33 tv Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:25 lukem Exp $
PROG= collect2
BINDIR= /usr/libexec
@@ -6,6 +6,6 @@ SRCS= collect2.c tlink.c hash.c cplus-dem.c underscore.c \
version.c choose-temp.c mkstemp.c obstack.c
CPPFLAGS+= -DTARGET_MACHINE=\"${MACHINE_GNU_ARCH}-netbsd\"
-NOMAN=
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/egcs/common/Makefile b/gnu/usr.bin/egcs/common/Makefile
index f5698426f23..3686ffc290d 100644
--- a/gnu/usr.bin/egcs/common/Makefile
+++ b/gnu/usr.bin/egcs/common/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.23 1999/02/09 15:28:59 tv Exp $
+# $NetBSD: Makefile,v 1.24 1999/02/13 02:54:25 lukem Exp $
.include "../Makefile.inc"
LIB= cc1
-NOMAN=
-NOLINKLIB=
-NOPIC=
+MKLINKLIB=no
+MKMAN= no
+MKPIC= no
YHEADER=1
# GNU (gcc,gas) uses "mips" as arch-dependent filename for mipsel and mipseb
diff --git a/gnu/usr.bin/gasp/Makefile b/gnu/usr.bin/gasp/Makefile
index 56b8e8b43be..08194e98ac5 100644
--- a/gnu/usr.bin/gasp/Makefile
+++ b/gnu/usr.bin/gasp/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 1998/12/29 15:13:03 tv Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:25 lukem Exp $
DIST= ${.CURDIR}/../../dist
PROG= gasp
SRCS= gasp.c macro.c sb.c hash.c
-NOMAN=
+MKMAN= no
.PATH: ${DIST}/gas
diff --git a/gnu/usr.bin/gdb/Makefile b/gnu/usr.bin/gdb/Makefile
index 618e4d8e335..8b952becaed 100644
--- a/gnu/usr.bin/gdb/Makefile
+++ b/gnu/usr.bin/gdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 1999/02/11 16:53:39 tv Exp $
+# $NetBSD: Makefile,v 1.25 1999/02/13 02:54:25 lukem Exp $
# for OBJECT_FMT
.include <bsd.own.mk>
@@ -50,7 +50,7 @@ NATDEPFILES= infptrace.c inftarg.c fork-child.c corelow.c ${NATDEPFILES.${MACHIN
.if (${MACHINE_ARCH} != "arm32") && (${MACHINE_ARCH} != "powerpc")
NATDEPFILES+= kcore-nbsd.c
.endif
-.if !defined(NOPIC)
+.if ${MKPIC} != "no"
NATDEPFILES+= solib.c
.endif
diff --git a/gnu/usr.bin/grep/common/Makefile b/gnu/usr.bin/grep/common/Makefile
index f2061bf7793..18a0bd9e56a 100644
--- a/gnu/usr.bin/grep/common/Makefile
+++ b/gnu/usr.bin/grep/common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/02/11 17:26:23 tv Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:25 lukem Exp $
LIB= common
SRCS= bindtextdom.c dcgettext.c dgettext.c gettext.c finddomain.c \
@@ -9,10 +9,10 @@ SRCS+= grep.c dfa.c kwset.c obstack.c savedir.c getopt.c getopt1.c \
CPPFLAGS+= -DGNULOCALEDIR=\"/usr/share/locale\" \
-DLOCALE_ALIAS_PATH=\"/usr/share/locale:.\"
-NOLINT=
-NOPIC=
-NOPROFILE=
-NOLINKLIB=
+MKLINT= no
+MKPIC= no
+MKPROFILE= no
+MKLINKLIB= no
.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/grep/egrep/Makefile b/gnu/usr.bin/grep/egrep/Makefile
index 09a5eed2444..3cb29b3b928 100644
--- a/gnu/usr.bin/grep/egrep/Makefile
+++ b/gnu/usr.bin/grep/egrep/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 1999/02/09 13:19:15 simonb Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:26 lukem Exp $
PROG= egrep
SRCS= egrepmat.c
-NOMAN= link to grep.1
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/grep/fgrep/Makefile b/gnu/usr.bin/grep/fgrep/Makefile
index 2d643a544ae..42405c95fbd 100644
--- a/gnu/usr.bin/grep/fgrep/Makefile
+++ b/gnu/usr.bin/grep/fgrep/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 1999/02/09 13:19:15 simonb Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:26 lukem Exp $
PROG= fgrep
SRCS= fgrepmat.c
-NOMAN= link to grep.1
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/Makefile b/gnu/usr.bin/groff/Makefile
index eb0f7567986..2aabe179214 100644
--- a/gnu/usr.bin/groff/Makefile
+++ b/gnu/usr.bin/groff/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.9 1998/09/29 23:47:36 lukem Exp $
+# $NetBSD: Makefile,v 1.10 1999/02/13 02:54:26 lukem Exp $
+
+.include <bsd.own.mk>
SUBDIR= libgroff libdriver libbib\
groff troff nroff tbl pic eqn grog grops grotty grodvi grolj4 \
refer lookbib indxbib lkbib hpftodit tfmtodit addftinfo pfbtops psbb
-.if !defined(NOSHARE) || \
+.if ${MKSHARE} != "no" || \
make(clean) || make(cleandir) || make(distclean) || make(obj)
SUBDIR+=devices tmac mm man
.endif
diff --git a/gnu/usr.bin/groff/Makefile.cfg b/gnu/usr.bin/groff/Makefile.cfg
index 4d60a12d146..d74787744ef 100644
--- a/gnu/usr.bin/groff/Makefile.cfg
+++ b/gnu/usr.bin/groff/Makefile.cfg
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.cfg,v 1.25 1999/02/09 15:33:45 tv Exp $
+# $NetBSD: Makefile.cfg,v 1.26 1999/02/13 02:54:26 lukem Exp $
.if defined(PROG)
LDADD+= -lgnumalloc
DPADD+= /usr/lib/libgnumalloc.a
.endif
-NOLINT= nolint (c++)
+MKLINT= no
# Paths to libraries
#
diff --git a/gnu/usr.bin/groff/devices/Makefile.dev b/gnu/usr.bin/groff/devices/Makefile.dev
index 513e929efd2..2723def29a2 100644
--- a/gnu/usr.bin/groff/devices/Makefile.dev
+++ b/gnu/usr.bin/groff/devices/Makefile.dev
@@ -1,5 +1,5 @@
# from: @(#)Makefile.dev 6.2 (Berkeley) 3/16/91
-# $NetBSD: Makefile.dev,v 1.22 1998/09/27 17:22:04 lukem Exp $
+# $NetBSD: Makefile.dev,v 1.23 1999/02/13 02:54:26 lukem Exp $
# Client Makefiles define DEVICE and FONTFILES and provide rules for
# individual font files
@@ -17,7 +17,7 @@ FONTMODE?= ${FILESMODE}
.MAIN: all
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
all: $(FONTFILES)
.else
all:
@@ -31,7 +31,7 @@ COPY= -c
.endif
.if !target(install)
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES=${FONTFILES}
FILESDIR=${DEVICEDIR}
GENFILES=${FONTFILES:Mgenerate/*}
diff --git a/gnu/usr.bin/groff/devices/devX100-12/Makefile b/gnu/usr.bin/groff/devices/devX100-12/Makefile
index 0d7a0d7eabe..1be4e7bbc94 100644
--- a/gnu/usr.bin/groff/devices/devX100-12/Makefile
+++ b/gnu/usr.bin/groff/devices/devX100-12/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 1998/09/05 14:57:41 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:26 lukem Exp $
DEVICE= X100-12
FONTFILES= CB CBI CI CR HB HBI HI HR NB NBI NI NR S TB TBI TI TR DESC
-NOOBJ= noobj
+MKOBJ= no
clean cleandir distclean:
diff --git a/gnu/usr.bin/groff/devices/devX100/Makefile b/gnu/usr.bin/groff/devices/devX100/Makefile
index 057d6646c4b..55933cf0ea5 100644
--- a/gnu/usr.bin/groff/devices/devX100/Makefile
+++ b/gnu/usr.bin/groff/devices/devX100/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 1998/09/05 14:57:41 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:26 lukem Exp $
DEVICE= X100
FONTFILES= CB CBI CI CR HB HBI HI HR NB NBI NI NR S TB TBI TI TR DESC
-NOOBJ= noobj
+MKOBJ= no
clean cleandir distclean:
diff --git a/gnu/usr.bin/groff/devices/devX75-12/Makefile b/gnu/usr.bin/groff/devices/devX75-12/Makefile
index 0214f393530..ea77925349d 100644
--- a/gnu/usr.bin/groff/devices/devX75-12/Makefile
+++ b/gnu/usr.bin/groff/devices/devX75-12/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 1998/09/05 14:57:42 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:26 lukem Exp $
DEVICE= X75-12
FONTFILES= CB CBI CI CR HB HBI HI HR NB NBI NI NR S TB TBI TI TR DESC
-NOOBJ= noobj
+MKOBJ= no
clean cleandir distclean:
diff --git a/gnu/usr.bin/groff/devices/devX75/Makefile b/gnu/usr.bin/groff/devices/devX75/Makefile
index 6aaabb45294..cff48430d7d 100644
--- a/gnu/usr.bin/groff/devices/devX75/Makefile
+++ b/gnu/usr.bin/groff/devices/devX75/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 1998/09/05 14:57:41 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:26 lukem Exp $
DEVICE= X75
FONTFILES= CB CBI CI CR HB HBI HI HR NB NBI NI NR S TB TBI TI TR DESC
-NOOBJ= noobj
+MKOBJ= no
clean cleandir distclean:
diff --git a/gnu/usr.bin/groff/devices/devdvi/Makefile b/gnu/usr.bin/groff/devices/devdvi/Makefile
index 8fcb4ce7c7f..30d7ed5eccb 100644
--- a/gnu/usr.bin/groff/devices/devdvi/Makefile
+++ b/gnu/usr.bin/groff/devices/devdvi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/09/05 14:57:42 lukem Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:27 lukem Exp $
DEVICE= dvi
FONTFILES= R I B BI CW MI S EX H HI HB SA SB DESC $(DEVGENFILES)
@@ -7,7 +7,7 @@ DEVGENFILES= generate/CompileFonts generate/Makefile generate/msam.map\
generate/texi.map generate/texmi.map generate/texr.map \
generate/texsy.map generate/textt.map
-NOOBJ= noobj
+MKOBJ= no
clean cleandir distclean:
diff --git a/gnu/usr.bin/groff/devices/devlj4/Makefile b/gnu/usr.bin/groff/devices/devlj4/Makefile
index ab39812548a..b0fb6bd71d4 100644
--- a/gnu/usr.bin/groff/devices/devlj4/Makefile
+++ b/gnu/usr.bin/groff/devices/devlj4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/09/05 14:57:42 lukem Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:27 lukem Exp $
DEVICE= lj4
FONTFILES= ALBB ALBR AOB AOI AOR CB CBI CI CR GB GBI GI GR LGB LGI LGR \
@@ -6,7 +6,7 @@ FONTFILES= ALBB ALBR AOB AOI AOR CB CBI CI CR GB GBI GI GR LGB LGI LGR \
CLARENDON CORONET MARIGOLD S \
DESC
-NOOBJ= noobj
+MKOBJ= no
clean cleandir distclean:
diff --git a/gnu/usr.bin/groff/devices/devps/Makefile b/gnu/usr.bin/groff/devices/devps/Makefile
index 6758351b4db..60af2291141 100644
--- a/gnu/usr.bin/groff/devices/devps/Makefile
+++ b/gnu/usr.bin/groff/devices/devps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/09/05 14:57:42 lukem Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:27 lukem Exp $
DEVICE= ps
FONTFILES= $(FONTS) $(SUPPORT) $(DEVGENFILES) DESC
@@ -10,7 +10,7 @@ DEVGENFILES= generate/Makefile generate/afmname generate/dingbatsmap \
generate/dingbatsrmap generate/lgreekmap generate/symbol.sed \
generate/symbolchars generate/symbolsl.afm generate/textmap
-NOOBJ= noobj
+MKOBJ= no
clean cleandir distclean:
diff --git a/gnu/usr.bin/groff/indxbib/Makefile b/gnu/usr.bin/groff/indxbib/Makefile
index af127106a66..bd6d1cb86de 100644
--- a/gnu/usr.bin/groff/indxbib/Makefile
+++ b/gnu/usr.bin/groff/indxbib/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.10 1998/09/27 17:22:04 lukem Exp $
+# $NetBSD: Makefile,v 1.11 1999/02/13 02:54:27 lukem Exp $
+
+.include <bsd.own.mk>
PROG= indxbib
SRCS= indxbib.cc dirnamemax.c signal.c
@@ -8,7 +10,7 @@ DPADD+= $(LIBBIB) $(LIBGROFF) $(LIBM)
COMMON_WORDS_FILE!=awk -F\" '/COMMON_WORDS_FILE/ { print $$2 }' ${.CURDIR}/../include/defs.h
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES=eign
FILESNAME=${COMMON_WORDS_FILE:T}
FILESDIR=${COMMON_WORDS_FILE:H}
diff --git a/gnu/usr.bin/groff/libbib/Makefile b/gnu/usr.bin/groff/libbib/Makefile
index 3efc0b7336b..0957540b6a1 100644
--- a/gnu/usr.bin/groff/libbib/Makefile
+++ b/gnu/usr.bin/groff/libbib/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.9 1997/10/25 10:12:02 lukem Exp $
+# $NetBSD: Makefile,v 1.10 1999/02/13 02:54:27 lukem Exp $
LIB= bib
SRCS= common.cc index.cc linear.cc search.cc map.c
CPPFLAGS+= -I$(.CURDIR)/../include
-NOMAN= noman
-NOPROFILE= noprofile
-NOPIC= nopic
+MKMAN= no
+MKPROFILE= no
+MKPIC= no
# only needed during build
libinstall::
diff --git a/gnu/usr.bin/groff/libdriver/Makefile b/gnu/usr.bin/groff/libdriver/Makefile
index 21f683a68e8..ddaf1279de5 100644
--- a/gnu/usr.bin/groff/libdriver/Makefile
+++ b/gnu/usr.bin/groff/libdriver/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.11 1997/10/25 10:12:06 lukem Exp $
+# $NetBSD: Makefile,v 1.12 1999/02/13 02:54:27 lukem Exp $
LIB= driver
SRCS= input.cc printer.cc
CPPFLAGS+= -I$(.CURDIR)/../include
-NOMAN= noman
-NOPROFILE= noprofile
-NOPIC= nopic
+MKMAN= no
+MKPROFILE= no
+MKPIC= no
# only needed during build
libinstall::
diff --git a/gnu/usr.bin/groff/libgroff/Makefile b/gnu/usr.bin/groff/libgroff/Makefile
index 004661eec0f..51b6ca1e351 100644
--- a/gnu/usr.bin/groff/libgroff/Makefile
+++ b/gnu/usr.bin/groff/libgroff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1997/10/25 10:12:09 lukem Exp $
+# $NetBSD: Makefile,v 1.12 1999/02/13 02:54:27 lukem Exp $
LIB= groff
SRCS= assert.cc change_lf.cc cmap.cc cset.cc device.cc errarg.cc\
@@ -9,9 +9,9 @@ SRCS= assert.cc change_lf.cc cmap.cc cset.cc device.cc errarg.cc\
SRCS+= iftoa.c itoa.c matherr.c
CPPFLAGS+= -I$(.CURDIR)/../include
-NOMAN= noman
-NOPROFILE= noprofile
-NOPIC= nopic
+MKMAN= no
+MKPROFILE= no
+MKPIC= no
CLEANFILES+= version.cc
version.cc: $(.CURDIR)/../VERSION
diff --git a/gnu/usr.bin/groff/mm/Makefile b/gnu/usr.bin/groff/mm/Makefile
index b0a87cac744..f5526d5b7bb 100644
--- a/gnu/usr.bin/groff/mm/Makefile
+++ b/gnu/usr.bin/groff/mm/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.15 1999/01/26 02:49:13 perry Exp $
+# $NetBSD: Makefile,v 1.16 1999/02/13 02:54:27 lukem Exp $
+
+.include <bsd.own.mk>
# XXX -- this depends on ../include/defs.h
TMACDIR?= /usr/share/tmac
@@ -14,7 +16,7 @@ TMACMODE?= ${FILESMODE}
MAN= groff_mm.7 groff_mmse.7
MLINKS= groff_mm.7 mm.7 groff_mmse.7 mmse.7
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES= tmac.m
LINKS= ${TMACDIR}/tmac.m ${TMACDIR}/tmac.mse
FILESDIR= ${TMACDIR}
diff --git a/gnu/usr.bin/groff/mm/mm/Makefile b/gnu/usr.bin/groff/mm/mm/Makefile
index 675158b8d45..161c91e9aa4 100644
--- a/gnu/usr.bin/groff/mm/mm/Makefile
+++ b/gnu/usr.bin/groff/mm/mm/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.4 1998/09/27 17:22:05 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:28 lukem Exp $
+
+.include <bsd.own.mk>
# XXX -- this depends on ../include/defs.h
TMACDIR?= /usr/share/tmac
@@ -7,7 +9,7 @@ TMACOWN?= ${FILESOWN}
TMACGRP?= ${FILESGRP}
TMACMODE?= ${FILESMODE}
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES= 0.MT 5.MT 4.MT ms.cov se_ms.cov locale se_locale
FILESDIR= ${TMACDIR}/mm
.endif
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index 19efdf915dd..da302e62c36 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.10 1998/09/27 17:22:05 lukem Exp $
+# $NetBSD: Makefile,v 1.11 1999/02/13 02:54:28 lukem Exp $
+
+.include <bsd.own.mk>
# XXX -- this depends on ../include/defs.h
TMACDIR?= /usr/share/tmac
@@ -10,7 +12,7 @@ TMACMODE?= ${FILESMODE}
MAN= groff_ms.7 msafer.7
MLINKS= groff_ms.7 ms.7
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES= tmac.pic tmac.ps tmac.psnew tmac.psold tmac.pspic tmac.psatk\
tmac.dvi tmac.tty tmac.tty-char tmac.X tmac.Xps tmac.latin1\
tmac.lj4 tmac.safer tmac.a4 tmac.s tmac.an man.local eqnrc \
diff --git a/gnu/usr.bin/groff/troff/Makefile b/gnu/usr.bin/groff/troff/Makefile
index 0c7062e8297..5d1638a5fac 100644
--- a/gnu/usr.bin/groff/troff/Makefile
+++ b/gnu/usr.bin/groff/troff/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.15 1998/09/27 17:22:06 lukem Exp $
+# $NetBSD: Makefile,v 1.16 1999/02/13 02:54:28 lukem Exp $
+
+.include <bsd.own.mk>
PROG= troff
SRCS= env.cc node.cc input.cc div.cc symbol.cc dictionary.cc reg.cc \
@@ -19,7 +21,7 @@ majorminor.cc: $(.CURDIR)/../VERSION
# XXX -- this depends on ../include/defs.h
TMACDIR=/usr/share/tmac
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES=hyphen.us
FILESDIR=${TMACDIR}
.endif
diff --git a/gnu/usr.bin/rcs/lib/Makefile b/gnu/usr.bin/rcs/lib/Makefile
index 9858c7390d4..3f84b3c2b97 100644
--- a/gnu/usr.bin/rcs/lib/Makefile
+++ b/gnu/usr.bin/rcs/lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/05/04 19:52:16 thorpej Exp $
+# $NetBSD: Makefile,v 1.16 1999/02/13 02:54:28 lukem Exp $
# Define FSYNC_ALL to get slower but safer writes in case of crashes in
# the middle of CVS/RCS changes
@@ -17,8 +17,8 @@ SRCS= maketime.c merger.c partime.c rcsedit.c rcsfcmp.c rcsfnms.c rcsgen.c \
rcskeep.c rcskeys.c rcslex.c rcsmap.c rcsrev.c rcssyn.c rcstime.c \
rcsutil.c version.c
-NOPROFILE=noprofile
-NOPIC=nopic
+MKPROFILE=no
+MKPIC=no
# only needed during build
libinstall::
diff --git a/gnu/usr.bin/send-pr/Makefile b/gnu/usr.bin/send-pr/Makefile
index 598cab5f67a..79a940890d1 100644
--- a/gnu/usr.bin/send-pr/Makefile
+++ b/gnu/usr.bin/send-pr/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.21 1999/02/12 12:56:27 tv Exp $
+# $NetBSD: Makefile,v 1.22 1999/02/13 02:54:28 lukem Exp $
+
+.include <bsd.own.mk>
#
# Makefile for building a standalone send-pr.
@@ -93,7 +95,7 @@ send-pr.1: send-pr.man Makefile
FILES=send-pr install-sid
FILESMODE_send-pr=${BINMODE}
FILESMODE_install-sid=${BINMODE}
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES+=categories
FILESDIR_categories=${LIBDIR}/gnats
FILESNAME_categories=${GNATS_SITE}
diff --git a/gnu/usr.bin/texinfo/common/Makefile b/gnu/usr.bin/texinfo/common/Makefile
index 645231834a5..f34c905faf3 100644
--- a/gnu/usr.bin/texinfo/common/Makefile
+++ b/gnu/usr.bin/texinfo/common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/02/11 17:06:13 tv Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:28 lukem Exp $
LIB= common
SRCS= bindtextdom.c dcgettext.c dgettext.c gettext.c finddomain.c \
@@ -9,10 +9,10 @@ SRCS+= getopt.c getopt1.c xmalloc.c xstrdup.c
CPPFLAGS+= -DGNULOCALEDIR=\"/usr/share/locale\" \
-DLOCALE_ALIAS_PATH=\"/usr/share/locale:.\"
-NOLINT=
-NOPROFILE=
-NOPIC=
-NOLINKLIB=
+MKLINT= no
+MKPROFILE= no
+MKPIC= no
+MKLINKLIB= no
.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile
index e327d5a9990..9ddb749a4af 100644
--- a/gnu/usr.bin/texinfo/info/Makefile
+++ b/gnu/usr.bin/texinfo/info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1999/02/11 15:42:15 tv Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:28 lukem Exp $
PROG= info
SRCS= dir.c display.c doc.c dribble.c echo-area.c filesys.c \
@@ -10,7 +10,7 @@ CPPFLAGS+= -I${DIST}/texinfo/info \
LDADD+= -ltermcap
DPADD+= ${LIBTERMCAP}
-NOMAN=
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/texinfo/install-info/Makefile b/gnu/usr.bin/texinfo/install-info/Makefile
index 499fd65a378..7104c196364 100644
--- a/gnu/usr.bin/texinfo/install-info/Makefile
+++ b/gnu/usr.bin/texinfo/install-info/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1 1999/02/11 15:42:15 tv Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:29 lukem Exp $
PROG= install-info
SRCS= install-info.c
LDADD+= -lz
DPADD+= ${LIBZ}
-NOMAN=
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile b/gnu/usr.bin/texinfo/makeinfo/Makefile
index c82e7acd75f..4548eb9924c 100644
--- a/gnu/usr.bin/texinfo/makeinfo/Makefile
+++ b/gnu/usr.bin/texinfo/makeinfo/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 1999/02/11 15:42:15 tv Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:29 lukem Exp $
PROG= makeinfo
SRCS= makeinfo.c multi.c
CPPFLAGS+= -I${DIST}/texinfo/makeinfo
-NOMAN=
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/texinfo/texindex/Makefile b/gnu/usr.bin/texinfo/texindex/Makefile
index 5f8fcfd35ec..dd3e30af87a 100644
--- a/gnu/usr.bin/texinfo/texindex/Makefile
+++ b/gnu/usr.bin/texinfo/texindex/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 1999/02/11 15:42:16 tv Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:29 lukem Exp $
PROG= texindex
SRCS= texindex.c
-NOMAN=
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/include/Makefile b/include/Makefile
index 7422835c691..5aa41f9bed4 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 1999/01/15 12:29:16 lukem Exp $
+# $NetBSD: Makefile,v 1.74 1999/02/13 02:54:29 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 1/4/94
# Doing a make includes builds /usr/include
@@ -23,6 +23,6 @@ INCS+= rpc/auth.h rpc/auth_unix.h rpc/clnt.h rpc/pmap_clnt.h rpc/pmap_prot.h \
INCS+= rpcsvc/yp_prot.h rpcsvc/ypclnt.h
INCSDIR=/usr/include
-NOOBJ= noobj
+MKOBJ= no
.include <bsd.prog.mk>
diff --git a/lib/libarch/m68k/Makefile b/lib/libarch/m68k/Makefile
index 3e92fd2a83d..d5eec80a0d4 100644
--- a/lib/libarch/m68k/Makefile
+++ b/lib/libarch/m68k/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 1999/02/09 22:32:33 is Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:29 lukem Exp $
SRCS= m68k_sync_icache.S
-NOLINT=yes
+MKLINT=no
.include <bsd.lib.mk>
diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile
index 9f004a9c5c9..db8192059b4 100644
--- a/lib/libbz2/Makefile
+++ b/lib/libbz2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 1998/09/14 03:18:12 ross Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:29 lukem Exp $
LIB= bz2
-NOMAN= libbz2.3
+MKMAN= no
SRCS=blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c bzlib.c
INCS= bzlib.h
diff --git a/lib/libc/md/Makefile.inc b/lib/libc/md/Makefile.inc
index 4cc4bfe3130..f8c5549c386 100644
--- a/lib/libc/md/Makefile.inc
+++ b/lib/libc/md/Makefile.inc
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.3 1997/05/09 07:50:13 mycroft Exp $
+# $NetBSD: Makefile.inc,v 1.4 1999/02/13 02:54:29 lukem Exp $
+
+.include <bsd.own.mk>
# MD4/MD5 sources
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/md ${.CURDIR}/md
@@ -14,7 +16,7 @@ MLINKS+=md5.3 MD5End.3 md5.3 MD5File.3 md5.3 MD5Data.3
CLEANFILES+= md[45]hl.c md[45].3
-.if !defined(NOMAN)
+.if ${MKMAN} != "no"
md4.3: mdX.3
sed -e 's/mdX/md4/g' -e 's/MDX/MD4/g' $> > $@
cat ${>:H}/md4.copyright >> $@
diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile
index 9282118bf6d..e0ca5a7b497 100644
--- a/lib/libcompat/Makefile
+++ b/lib/libcompat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 1998/09/14 20:25:03 tv Exp $
+# $NetBSD: Makefile,v 1.21 1999/02/13 02:54:30 lukem Exp $
LIB= compat
CPPFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -D__LIBCOMPAT_SOURCE__
@@ -6,7 +6,7 @@ AINC= -I${.CURDIR}/../libc/arch/${MACHINE_ARCH}
.if defined(DESTDIR)
AINC+= -nostdinc -idirafter ${DESTDIR}/usr/include
.endif
-NOPIC= nopic
+MKPIC= no
.PATH: ${.CURDIR}/4.1/${MACHINE_ARCH} ${.CURDIR}/4.1 \
${.CURDIR}/4.3/${MACHINE_ARCH} ${.CURDIR}/4.3 \
diff --git a/lib/libl/Makefile b/lib/libl/Makefile
index eb94369ede7..b05b00c84f7 100644
--- a/lib/libl/Makefile
+++ b/lib/libl/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 1999/02/12 11:22:55 lukem Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:30 lukem Exp $
LIB= l
SRCS= libmain.c libyywrap.c
-NOPIC=
+MKPIC= no
LINKS= /usr/lib/libl.a /usr/lib/libfl.a
diff --git a/lib/librmt/Makefile b/lib/librmt/Makefile
index 34e610fa298..361c2dca1fd 100644
--- a/lib/librmt/Makefile
+++ b/lib/librmt/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.4 1997/10/09 14:36:23 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:30 lukem Exp $
LIB= rmt
SRCS= rmtlib.c
MAN= rmtops.3
-NOPROFILE=
-NOPIC=
+MKPROFILE=no
+MKPIC= no
.include <bsd.lib.mk>
diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile
index 6b28b631d37..2c0a33c9703 100644
--- a/lib/librpcsvc/Makefile
+++ b/lib/librpcsvc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 1997/10/09 22:26:17 lukem Exp $
+# $NetBSD: Makefile,v 1.24 1999/02/13 02:54:30 lukem Exp $
RPCSRCS= bootparam_prot.x klm_prot.x mount.x nfs_prot.x\
nlm_prot.x rex.x rnusers.x rusers.x rquota.x rstat.x rwall.x\
@@ -11,8 +11,8 @@ INCS= ${HDRS} ${RPCSRCS}
INCSDIR= /usr/include/rpcsvc
LIB= rpcsvc
-NOMAN=
-NOPIC=
+MKMAN= no
+MKPIC= no
# We don't use explicit suffix rules here to avoid dependencies in the
# Installed files.
diff --git a/lib/liby/Makefile b/lib/liby/Makefile
index f66bfa713cf..d922e716afe 100644
--- a/lib/liby/Makefile
+++ b/lib/liby/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 1998/01/22 07:02:52 perry Exp $
+# $NetBSD: Makefile,v 1.8 1999/02/13 02:54:30 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93
LIB= y
SRCS= main.c yyerror.c
-NOPIC= nopic
+MKPIC= no
.include <bsd.lib.mk>
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 55eb7e9c410..d4c986ea7e9 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 1998/11/01 20:33:25 tron Exp $
+# $NetBSD: Makefile,v 1.12 1999/02/13 02:54:30 lukem Exp $
LIB= z
-NOMAN= zlib.3
+MKMAN= no
SRCS= adler32.c compress.c crc32.c deflate.c example.c gzio.c infblock.c \
infcodes.c inffast.c inflate.c inftrees.c infutil.c trees.c uncompr.c \
diff --git a/libexec/ld.elf_so/Makefile b/libexec/ld.elf_so/Makefile
index 302d24633d9..d4d32d04a49 100644
--- a/libexec/ld.elf_so/Makefile
+++ b/libexec/ld.elf_so/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 1999/02/07 17:23:03 christos Exp $
+# $NetBSD: Makefile,v 1.20 1999/02/13 02:54:30 lukem Exp $
.include <bsd.own.mk> # for OBJECT_FMT definition
-.if ((${OBJECT_FMT} == "ELF") && !defined(NOPIC))
+.if ${OBJECT_FMT} == "ELF" && ${MKPIC} != "no"
PROG= ld.elf_so
.endif
@@ -49,6 +49,6 @@ includes:
done
.endif
-NOMAN=
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/regress/include/bitstring/Makefile b/regress/include/bitstring/Makefile
index 47230f15732..ddae1c12697 100644
--- a/regress/include/bitstring/Makefile
+++ b/regress/include/bitstring/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 1997/09/30 23:15:43 is Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:31 lukem Exp $
PROG= bitstring_test
-NOMAN= noman, no way, man
+MKMAN= no
regress: test-8 test-27 test-32 test-49 test-64 test-67
diff --git a/regress/include/stdarg/Makefile b/regress/include/stdarg/Makefile
index b17321366d4..1a8d9c1bcd2 100644
--- a/regress/include/stdarg/Makefile
+++ b/regress/include/stdarg/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 1997/10/26 21:50:55 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:31 lukem Exp $
PROG= stdargtest
SRCS= argtest.c
-NOMAN= noman, no way, man
+MKMAN= no
CPPFLAGS+= -DSTDARG
diff --git a/regress/include/varargs/Makefile b/regress/include/varargs/Makefile
index 41c9d453ed7..10da73f0ebc 100644
--- a/regress/include/varargs/Makefile
+++ b/regress/include/varargs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 1997/10/26 21:50:57 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:31 lukem Exp $
PROG= varargstest
SRCS= argtest.c
-NOMAN= noman, no way, man
+MKMAN= no
CPPFLAGS+= -DVARARGS
diff --git a/regress/lib/libc/_setjmp/Makefile b/regress/lib/libc/_setjmp/Makefile
index ddb02d1040f..07bb57c830d 100644
--- a/regress/lib/libc/_setjmp/Makefile
+++ b/regress/lib/libc/_setjmp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 1997/10/26 21:50:59 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:31 lukem Exp $
PROG= _setjmptest
SRCS= jmptest.c
-NOMAN= noman, no way, man
+MKMAN= no
CPPFLAGS+= -DTEST_U_SETJMP
diff --git a/regress/lib/libc/arch/alpha/divremtest/Makefile b/regress/lib/libc/arch/alpha/divremtest/Makefile
index bd3b12f5373..2a10ed245cf 100644
--- a/regress/lib/libc/arch/alpha/divremtest/Makefile
+++ b/regress/lib/libc/arch/alpha/divremtest/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 1995/04/24 05:53:34 cgd Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:31 lukem Exp $
PROG= divremtest
-NOMAN=
+MKMAN= no
CLEANFILES+= mkcases cases.c mktestcases testcases
diff --git a/regress/lib/libc/db/Makefile b/regress/lib/libc/db/Makefile
index 719dc777e8f..83a2d0989c6 100644
--- a/regress/lib/libc/db/Makefile
+++ b/regress/lib/libc/db/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1997/10/26 21:51:00 lukem Exp $
+# $NetBSD: Makefile,v 1.14 1999/02/13 02:54:31 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
PROG= dbtest
@@ -6,7 +6,7 @@ PROG= dbtest
# add -DSTATISTICS to CPPFLAGS to get usage statistics. Note that
# for this to work, libc must be compiled with -DSTATISTICS as well
CPPFLAGS+= -g -D__DBINTERFACE_PRIVATE -DDEBUG
-NOMAN= noman
+MKMAN= no
CLEANFILES+= t1 t2 t3
regress:
diff --git a/regress/lib/libc/ieeefp/except/Makefile b/regress/lib/libc/ieeefp/except/Makefile
index 60395aea974..064e368edef 100644
--- a/regress/lib/libc/ieeefp/except/Makefile
+++ b/regress/lib/libc/ieeefp/except/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 1997/05/07 16:01:40 mycroft Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:32 lukem Exp $
PROG= except
-SRCS= except.c
-NOMAN=
+MKMAN= no
regress: ${PROG}
./${PROG}
diff --git a/regress/lib/libc/ieeefp/round/Makefile b/regress/lib/libc/ieeefp/round/Makefile
index a4385cf87d5..8a56053d7b9 100644
--- a/regress/lib/libc/ieeefp/round/Makefile
+++ b/regress/lib/libc/ieeefp/round/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 1997/05/07 16:01:41 mycroft Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:32 lukem Exp $
PROG= round
-SRCS= round.c
-NOMAN=
+MKMAN= no
regress: ${PROG}
./${PROG}
diff --git a/regress/lib/libc/regex/Makefile b/regress/lib/libc/regex/Makefile
index f195ef04ece..d08d21af834 100644
--- a/regress/lib/libc/regex/Makefile
+++ b/regress/lib/libc/regex/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 1997/10/26 21:51:02 lukem Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:32 lukem Exp $
PROG= re
SRCS= main.c split.c debug.c
-NOMAN=
+MKMAN= no
CPPFLAGS+= -I${.CURDIR}/../../../../lib/libc/regex
diff --git a/regress/lib/libc/setjmp/Makefile b/regress/lib/libc/setjmp/Makefile
index bc80eec4bf0..cdf61a23795 100644
--- a/regress/lib/libc/setjmp/Makefile
+++ b/regress/lib/libc/setjmp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 1997/10/26 21:51:04 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:32 lukem Exp $
PROG= setjmptest
SRCS= jmptest.c
-NOMAN= noman, no way, man
+MKMAN= no
CPPFLAGS+= -DTEST_SETJMP
diff --git a/regress/lib/libc/sigsetjmp/Makefile b/regress/lib/libc/sigsetjmp/Makefile
index fdf003b8907..c483e956557 100644
--- a/regress/lib/libc/sigsetjmp/Makefile
+++ b/regress/lib/libc/sigsetjmp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 1997/10/26 21:51:05 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:32 lukem Exp $
PROG= sigsetjmptest
SRCS= jmptest.c
-NOMAN= noman, no way, man
+MKMAN= no
CPPFLAGS+= -DTEST_SIGSETJMP
diff --git a/regress/lib/libc/time/strptime/Makefile b/regress/lib/libc/time/strptime/Makefile
index a233299d794..c473b38db2a 100644
--- a/regress/lib/libc/time/strptime/Makefile
+++ b/regress/lib/libc/time/strptime/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 1998/01/22 19:25:15 thorpej Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:32 lukem Exp $
PROG= strptime
SRCS= main.c
-NOMAN=
+MKMAN= no
WARNS?= 1
CLEANFILES+= got
diff --git a/regress/sys/arch/i386/ldt/Makefile b/regress/sys/arch/i386/ldt/Makefile
index 3edd3cf951d..85e2b56f5bf 100644
--- a/regress/sys/arch/i386/ldt/Makefile
+++ b/regress/sys/arch/i386/ldt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 1998/04/13 14:28:04 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:32 lukem Exp $
#
PROG= testldt
-NOMAN= noman
+MKMAN= no
DPADD+= ${LIBARCH}
LDADD+= -li386
diff --git a/regress/sys/arch/m68k/060sp/Makefile b/regress/sys/arch/m68k/060sp/Makefile
index fb3bcb6f437..1e3dceecb49 100644
--- a/regress/sys/arch/m68k/060sp/Makefile
+++ b/regress/sys/arch/m68k/060sp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 1998/06/16 19:06:31 is Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:33 lukem Exp $
-NOMAN=notyet
+MKMAN=no
PROG=dotest
SRCS=dotest.c dotestsubs.S
AFLAGS+=-I.
diff --git a/regress/sys/arch/m68k/emuspeed/Makefile b/regress/sys/arch/m68k/emuspeed/Makefile
index c96d564339a..20b421a12a8 100644
--- a/regress/sys/arch/m68k/emuspeed/Makefile
+++ b/regress/sys/arch/m68k/emuspeed/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 1998/01/09 08:03:55 perry Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:33 lukem Exp $
#
PROG=emuspeed
-NOMAN=none
+MKMAN=no
SRCS=emuspeed.c test.s mul64.s div64.s # movepto.c movepfrom.c
diff --git a/regress/sys/kern/execve/Makefile b/regress/sys/kern/execve/Makefile
index a112a900e3b..bb75a684c4a 100644
--- a/regress/sys/kern/execve/Makefile
+++ b/regress/sys/kern/execve/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 1999/01/10 02:54:12 castor Exp $
+# $NetBSD: Makefile,v 1.10 1999/02/13 02:54:33 lukem Exp $
PROG= doexec
-NOMAN= noman, no way, man
+MKMAN= no
LDSTATIC= -static # only static compilation makes sense here
diff --git a/regress/sys/kern/unfdpass/Makefile b/regress/sys/kern/unfdpass/Makefile
index 2f4651ff3f3..7a9d58b6296 100644
--- a/regress/sys/kern/unfdpass/Makefile
+++ b/regress/sys/kern/unfdpass/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1998/03/02 21:57:38 cgd Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:33 lukem Exp $
PROG= unfdpass
-NOMAN= noman, no way, man
+MKMAN= no
CLEANFILES+=file1 file2 output test-sock
diff --git a/regress/usr.bin/m4/Makefile b/regress/usr.bin/m4/Makefile
index 5689bd8770c..d211d6b0b88 100644
--- a/regress/usr.bin/m4/Makefile
+++ b/regress/usr.bin/m4/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 1997/12/30 23:30:48 cgd Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:33 lukem Exp $
-NOMAN= noman, no way, man
+MKMAN= no
CLEANFILES+= ff_after_dnl.m4
diff --git a/sbin/edlabel/Makefile b/sbin/edlabel/Makefile
index 8d774b8475c..4d15166c382 100644
--- a/sbin/edlabel/Makefile
+++ b/sbin/edlabel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1997/12/17 21:16:54 scw Exp $
+# $NetBSD: Makefile,v 1.8 1999/02/13 02:54:33 lukem Exp $
# edlabel (Edit Disk LABEL)
.if (${MACHINE} == "sun3") || (${MACHINE} == "sun3x") || \
@@ -9,6 +9,6 @@ LDADD+=-lutil
DPADD+=${LIBUTIL}
.endif
-NOMAN=
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/sbin/fdisk/mbr/Makefile b/sbin/fdisk/mbr/Makefile
index b3bfd6ac426..964a68694be 100644
--- a/sbin/fdisk/mbr/Makefile
+++ b/sbin/fdisk/mbr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1998/10/15 15:22:13 ws Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:33 lukem Exp $
BINDIR= /usr/mdec
BINMODE=444
@@ -7,7 +7,7 @@ STRIPFLAG=
PROG= mbr
SRCS= mbr.S
-NOMAN=
+MKMAN= no
${PROG}: ${OBJS}
${LD} -o ${PROG}.tmp -e _start -N -Ttext 0x600 ${OBJS}
diff --git a/share/Makefile b/share/Makefile
index 5f64e69739f..8563facd193 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 1998/09/27 16:31:39 lukem Exp $
+# $NetBSD: Makefile,v 1.8 1999/02/13 02:54:34 lukem Exp $
# from @(#)Makefile 8.1 (Berkeley) 6/5/93
# Missing: ms
.include <bsd.own.mk>
-.if !defined(NOSHARE) || \
+.if ${MKSHARE} != "no" || \
make(clean) || make(cleandir) || make(distclean) || make(obj)
SUBDIR= dict doc examples lkm man me misc mk skel tabset termcap tmac zoneinfo
.endif
diff --git a/share/dict/Makefile b/share/dict/Makefile
index b7b4e995951..158a9043e72 100644
--- a/share/dict/Makefile
+++ b/share/dict/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 1997/05/22 18:05:44 cjs Exp $
+# $NetBSD: Makefile,v 1.14 1999/02/13 02:54:34 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# Missing: connectives, words
FILES= README propernames web2 web2a
FILESDIR=${BINDIR}/dict
-NOOBJ= noobj
+MKOBJ= no
LINKS= ${FILESDIR}/web2 ${FILESDIR}/words
.include <bsd.prog.mk>
diff --git a/share/doc/psd/Makefile b/share/doc/psd/Makefile
index 66d3eb2e76d..71b1470224b 100644
--- a/share/doc/psd/Makefile
+++ b/share/doc/psd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/09/27 17:22:06 lukem Exp $
+# $NetBSD: Makefile,v 1.9 1999/02/13 02:54:34 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 5/23/94
# The following modules do not build/install:
@@ -12,7 +12,7 @@
# 11.adb 15.yacc 16.lex
BINDIR= /usr/share/doc/psd
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES= 00.contents Makefile Title
.endif
SUBDIR= 05.sysman 20.ipctut 21.ipc
diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile
index 391bf1ca2f0..44b29587eb5 100644
--- a/share/doc/smm/Makefile
+++ b/share/doc/smm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1998/09/27 17:22:07 lukem Exp $
+# $NetBSD: Makefile,v 1.16 1999/02/13 02:54:34 lukem Exp $
# from: @(#)Makefile 8.2 (Berkeley) 5/10/94
# The following modules do not build/install:
@@ -11,7 +11,7 @@
# 14.uucpimpl 15.uucpnet 16.security 17.password
BINDIR= /usr/share/doc/smm
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES= 00.contents Makefile Title
.endif
SUBDIR= 01.setup 04.quotas 05.fastfs 06.nfs 18.net
diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile
index 173335ac78e..d138bca6e32 100644
--- a/share/doc/usd/Makefile
+++ b/share/doc/usd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1998/09/27 17:22:07 lukem Exp $
+# $NetBSD: Makefile,v 1.18 1999/02/13 02:54:34 lukem Exp $
#
# @(#)Makefile 8.3 (Berkeley) 5/16/94
@@ -14,7 +14,7 @@
# 25.tbl 26.refer 27.invert 29.diction
BINDIR= /usr/share/doc/usd
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES= 00.contents Makefile Title
.endif
SUBDIR= 18.msdiffs 19.memacros 20.meref
diff --git a/share/examples/amd/Makefile b/share/examples/amd/Makefile
index 1bca4f80b2d..eff066607f4 100644
--- a/share/examples/amd/Makefile
+++ b/share/examples/amd/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.4 1998/09/27 17:22:07 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:34 lukem Exp $
-.if !defined(NOSHARE)
+.include <bsd.own.mk>
+
+.if ${MKSHARE} != "no"
FILES= cd master net
FILESDIR=/usr/share/examples/amd
.endif
-NOOBJ= noobj
+MKOBJ= no
.include <bsd.prog.mk>
diff --git a/share/examples/emul/svr4/etc/Makefile b/share/examples/emul/svr4/etc/Makefile
index 4731b9913a8..8e43d32ff67 100644
--- a/share/examples/emul/svr4/etc/Makefile
+++ b/share/examples/emul/svr4/etc/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.2 1998/09/27 17:22:08 lukem Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:35 lukem Exp $
-.if !defined(NOSHARE)
+.include <bsd.own.mk>
+
+.if ${MKSHARE} != "no"
FILES= SVR4_MAKEDEV netconfig nsswitch.conf
FILESDIR=/usr/share/examples/emul/svr4/etc
.endif
-NOOBJ= noobj
+MKOBJ= no
.include <bsd.prog.mk>
diff --git a/share/examples/emul/ultrix/etc/Makefile b/share/examples/emul/ultrix/etc/Makefile
index 35723e850e8..628a75d2a6a 100644
--- a/share/examples/emul/ultrix/etc/Makefile
+++ b/share/examples/emul/ultrix/etc/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.2 1998/09/27 17:22:08 lukem Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:35 lukem Exp $
-.if !defined(NOSHARE)
+.include <bsd.own.mk>
+
+.if ${MKSHARE} != "no"
FILES= svc.conf
FILESDIR=/usr/share/examples/emul/ultrix/etc
.endif
-NOOBJ= noobj
+MKOBJ= no
.include <bsd.prog.mk>
diff --git a/share/examples/ftpd/Makefile b/share/examples/ftpd/Makefile
index c6e841476fb..9a8fcfea2fd 100644
--- a/share/examples/ftpd/Makefile
+++ b/share/examples/ftpd/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.2 1998/09/27 17:22:09 lukem Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:35 lukem Exp $
-.if !defined(NOSHARE)
+.include <bsd.own.mk>
+
+.if ${MKSHARE} != "no"
FILES= ftpd.conf
FILESDIR=/usr/share/examples/ftpd
.endif
-NOOBJ= noobj
+MKOBJ= no
.include <bsd.prog.mk>
diff --git a/share/examples/supfiles/Makefile b/share/examples/supfiles/Makefile
index 860b1fd19fe..a96ad2797b1 100644
--- a/share/examples/supfiles/Makefile
+++ b/share/examples/supfiles/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.3 1999/02/01 16:02:38 minoura Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:35 lukem Exp $
-.if !defined(NOSHARE)
+.include <bsd.own.mk>
+
+.if ${MKSHARE} != "no"
FILES= ftp.cs.umn.edu skarven.itea.unit.no sup.au.netbsd.org \
sup.de.netbsd.org sup.jp.netbsd.org sup.netbsd.org sup.uk.netbsd.org
FILESDIR=/usr/share/examples/supfiles
.endif
-NOOBJ= noobj
+MKOBJ= no
.include <bsd.prog.mk>
diff --git a/share/lkm/Makefile b/share/lkm/Makefile
index 2ae0f1b2d17..896ceb65fb7 100644
--- a/share/lkm/Makefile
+++ b/share/lkm/Makefile
@@ -1,9 +1,9 @@
#
-# $NetBSD: Makefile,v 1.14 1997/10/13 11:19:58 lukem Exp $
+# $NetBSD: Makefile,v 1.15 1999/02/13 02:54:35 lukem Exp $
#
FILES= README syscall vfs misc
-NOOBJ= noobj
+MKOBJ= no
install:
find ${FILES} -follow -name CVS -prune -o -type f -print | \
diff --git a/share/lkm/misc/test/Makefile b/share/lkm/misc/test/Makefile
index 43b1d0d1916..b3a251d3797 100644
--- a/share/lkm/misc/test/Makefile
+++ b/share/lkm/misc/test/Makefile
@@ -33,11 +33,11 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $NetBSD: Makefile,v 1.2 1997/10/13 11:20:27 lukem Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:35 lukem Exp $
#
PROG= testmisc
-NOMAN=
+MKMAN= no
load:
@echo "This test program will call the sample system call;"
diff --git a/share/lkm/syscall/test/Makefile b/share/lkm/syscall/test/Makefile
index af0160c25e1..a2b00f9a8b5 100644
--- a/share/lkm/syscall/test/Makefile
+++ b/share/lkm/syscall/test/Makefile
@@ -33,11 +33,11 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $NetBSD: Makefile,v 1.2 1997/10/13 11:20:49 lukem Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:35 lukem Exp $
#
PROG= testsyscall
-NOMAN=
+MKMAN= no
load:
@echo "This test program will call the sample system call;"
diff --git a/share/man/Makefile b/share/man/Makefile
index 18b7877b8c5..4b05ebe684e 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.17 1998/09/27 17:22:09 lukem Exp $
+# $NetBSD: Makefile,v 1.18 1999/02/13 02:54:36 lukem Exp $
# from: @(#)Makefile 8.2 (Berkeley) 4/16/94
-.if !defined(NOSHARE)
+.include <bsd.own.mk>
+
+.if ${MKSHARE} != "no"
SUBDIR= man0 man1 man3 man4 man5 man6 man7 man8 man9
makedb:
diff --git a/share/man/man0/Makefile b/share/man/man0/Makefile
index 42a418ae559..0d6af80d91c 100644
--- a/share/man/man0/Makefile
+++ b/share/man/man0/Makefile
@@ -1,10 +1,12 @@
# from: @(#)Makefile 5.9 (Berkeley) 7/1/91
-# $NetBSD: Makefile,v 1.3 1998/09/27 17:22:10 lukem Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:36 lukem Exp $
-.if !defined(NOSHARE)
+.include <bsd.own.mk>
+
+.if ${MKSHARE} != "no"
FILES= makewhatis.sed COPYRIGHT
FILESDIR= /usr/share/man
.endif
-NOOBJ=
+MKOBJ= no
.include <bsd.prog.mk>
diff --git a/share/misc/Makefile b/share/misc/Makefile
index 247457933a3..38853de922d 100644
--- a/share/misc/Makefile
+++ b/share/misc/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.15 1999/01/26 04:35:19 thorpej Exp $
+# $NetBSD: Makefile,v 1.16 1999/02/13 02:54:36 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/8/93
FILES= airport ascii birthtoken domains eqnchar flowers getopt \
indent.pro inter.phone man.template mdoc.template na.phone \
operator style zipcodes
FILESDIR=${BINDIR}/misc
-NOOBJ= noobj
+MKOBJ= no
# According to iana@ISI.EDU, the URL below is the authoritative list
@@ -13,7 +13,7 @@ NOOBJ= noobj
update-domains:
ftp -o /tmp/domains.$$$$ http://www.iana.org/country-codes.txt ; \
( \
- echo '# $$NetBSD: Makefile,v 1.15 1999/01/26 04:35:19 thorpej Exp $$' ; \
+ echo '# $$NetBSD: Makefile,v 1.16 1999/02/13 02:54:36 lukem Exp $$' ; \
echo '# ISO 3166 country codes, from http://www.iana.org/country-codes.txt' ; \
echo '# '`grep ^Latest /tmp/domains.$$$$` ; \
echo '#' ; \
diff --git a/share/mk/Makefile b/share/mk/Makefile
index cd23b0552f6..ef15fd0dd99 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.23 1999/02/11 13:25:42 tv Exp $
+# $NetBSD: Makefile,v 1.24 1999/02/13 02:54:36 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-.if !defined(NOSHARE)
+.include <bsd.own.mk>
+
+.if ${MKSHARE} != "no"
FILES= bsd.README bsd.doc.mk bsd.dep.mk bsd.files.mk bsd.inc.mk bsd.info.mk \
bsd.kinc.mk bsd.kmod.mk bsd.lib.mk bsd.links.mk bsd.man.mk bsd.nls.mk \
bsd.obj.mk bsd.own.mk bsd.prog.mk bsd.subdir.mk bsd.sys.mk sys.mk
FILESDIR=/usr/share/mk
.endif
-NOOBJ= noobj
+MKOBJ= no
FILESMODE=444
diff --git a/share/skel/Makefile b/share/skel/Makefile
index 838453c68dc..d7dda5b71fa 100644
--- a/share/skel/Makefile
+++ b/share/skel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 1997/10/17 09:26:50 mrg Exp $
+# $NetBSD: Makefile,v 1.12 1999/02/13 02:54:36 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/8/93
FILES= dot.cshrc dot.login dot.mailrc dot.profile dot.rhosts
FILESDIR= ${BINDIR}/skel
-NOOBJ= noobj
+MKOBJ= no
.include <bsd.prog.mk>
diff --git a/share/tabset/Makefile b/share/tabset/Makefile
index 9fdb691d557..e86658ed3ea 100644
--- a/share/tabset/Makefile
+++ b/share/tabset/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 1997/10/17 09:17:39 mrg Exp $
+# $NetBSD: Makefile,v 1.12 1999/02/13 02:54:36 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/8/93
FILES= 3101 9837 aa aed512 beehive diablo dtc382 hp700-wy ibm3101 std \
stdcrt tandem653 teleray vt100 vt100-w wyse-adds xerox1720 xerox1730 \
xerox1730-lm zenith29
FILESDIR= ${BINDIR}/tabset
-NOOBJ= noobj
+MKOBJ= no
.include <bsd.prog.mk>
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index 18c9f85f511..8ef32555b73 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.20 1998/09/27 17:22:10 lukem Exp $
+# $NetBSD: Makefile,v 1.21 1999/02/13 02:54:36 lukem Exp $
-NOOBJ=
+.include <bsd.own.mk>
+
+MKOBJ=no
# Change the line below for your time zone (after finding the zone you want in
# the time zone files, or adding it to a time zone file).
@@ -72,7 +74,7 @@ posix_right: posix_only other_two
.PHONY: right_posix
right_posix: right_only other_two
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
afterinstall: ${DATA} ${REDO}
${ZIC} -y ${YEARISTYPE} -d ${TZDIR} -p ${POSIXRULES}
chown -R ${BINOWN}:${BINGRP} ${TZDIR}
diff --git a/sys/arch/alpha/stand/Makefile.bootprogs b/sys/arch/alpha/stand/Makefile.bootprogs
index 1b77e2c7a2f..7901050782b 100644
--- a/sys/arch/alpha/stand/Makefile.bootprogs
+++ b/sys/arch/alpha/stand/Makefile.bootprogs
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.bootprogs,v 1.3 1998/09/28 21:18:55 thorpej Exp $
+# $NetBSD: Makefile.bootprogs,v 1.4 1999/02/13 02:54:37 lukem Exp $
S= ${.CURDIR}/../../../..
.PATH: ${.CURDIR}/../common
-NOMAN=
+MKMAN= no
STRIPFLAG=
BINMODE= 444
diff --git a/sys/arch/alpha/stand/installboot/Makefile b/sys/arch/alpha/stand/installboot/Makefile
index ba0260970e7..cd9c7b7d962 100644
--- a/sys/arch/alpha/stand/installboot/Makefile
+++ b/sys/arch/alpha/stand/installboot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/03/02 19:57:00 cgd Exp $
+# $NetBSD: Makefile,v 1.10 1999/02/13 02:54:37 lukem Exp $
.include <bsd.own.mk>
@@ -11,7 +11,7 @@ WARNS?= 1
SRCS= installboot.c cd9660.c dkcksum.c
-NOMAN= yes
+MKMAN= no
CFLAGS+= -g -I${.CURDIR}/../..
LDSTATIC?=-static
diff --git a/sys/arch/alpha/stand/setnetbootinfo/Makefile b/sys/arch/alpha/stand/setnetbootinfo/Makefile
index 920c71907ce..62abe1e4427 100644
--- a/sys/arch/alpha/stand/setnetbootinfo/Makefile
+++ b/sys/arch/alpha/stand/setnetbootinfo/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 1998/03/02 21:36:55 cgd Exp $
+# $NetBSD: Makefile,v 1.9 1999/02/13 02:54:37 lukem Exp $
.include <bsd.own.mk>
PROG= setnetbootinfo
BINDIR= /usr/mdec
-NOMAN= yes
+MKMAN= no
CFLAGS+= -g -I${.CURDIR}/../..
LDSTATIC?=-static
diff --git a/sys/arch/amiga/stand/binpatch/Makefile b/sys/arch/amiga/stand/binpatch/Makefile
index 3d275598419..45b84f34518 100644
--- a/sys/arch/amiga/stand/binpatch/Makefile
+++ b/sys/arch/amiga/stand/binpatch/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 1997/06/22 05:16:57 mrg Exp $
+# $NetBSD: Makefile,v 1.8 1999/02/13 02:54:37 lukem Exp $
PROG= binpatch
-NOMAN= yes
+MKMAN= no
BINDIR= /sbin
LDFLAGS+=-static
diff --git a/sys/arch/amiga/stand/bootblock/aout2bb/Makefile b/sys/arch/amiga/stand/bootblock/aout2bb/Makefile
index ec9a3e6e46a..dabf9c6be32 100644
--- a/sys/arch/amiga/stand/bootblock/aout2bb/Makefile
+++ b/sys/arch/amiga/stand/bootblock/aout2bb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 1998/01/05 20:51:27 perry Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:37 lukem Exp $
#
PROG= aout2bb
-NOMAN= never
+MKMAN= no
SRCS= aout2bb.c chksum.c
.include <bsd.prog.mk>
diff --git a/sys/arch/amiga/stand/bootblock/installboot/Makefile b/sys/arch/amiga/stand/bootblock/installboot/Makefile
index 301a798e88a..e38f40ddf8c 100644
--- a/sys/arch/amiga/stand/bootblock/installboot/Makefile
+++ b/sys/arch/amiga/stand/bootblock/installboot/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 1997/06/16 13:39:48 is Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:37 lukem Exp $
SCRIPTS=installboot.sh
SCRIPTSNAME=installboot
-NOMAN=share/man/man8/man8.amiga
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/sys/arch/amiga/stand/bootblock/txlt/Makefile b/sys/arch/amiga/stand/bootblock/txlt/Makefile
index 99799c3af37..34fa1431ca7 100644
--- a/sys/arch/amiga/stand/bootblock/txlt/Makefile
+++ b/sys/arch/amiga/stand/bootblock/txlt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1998/01/05 20:51:29 perry Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:38 lukem Exp $
#
PROG=txlt
-NOMAN=never
+MKMAN= no
LDADD=-ll
CLEANFILES+= txlt.c
diff --git a/sys/arch/amiga/stand/loadkmap/Makefile b/sys/arch/amiga/stand/loadkmap/Makefile
index b41e166560c..24b15e15195 100644
--- a/sys/arch/amiga/stand/loadkmap/Makefile
+++ b/sys/arch/amiga/stand/loadkmap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 1998/03/13 19:28:11 is Exp $
+# $NetBSD: Makefile,v 1.9 1999/02/13 02:54:38 lukem Exp $
PROG=loadkmap
-NOMAN=loadkmap
+MKMAN= no
BINDIR=/usr/sbin
SUBDIR=din es fr sw us
diff --git a/sys/arch/amiga/stand/loadkmap/Makefile.inc b/sys/arch/amiga/stand/loadkmap/Makefile.inc
index 939c776dba2..940879a6ba8 100644
--- a/sys/arch/amiga/stand/loadkmap/Makefile.inc
+++ b/sys/arch/amiga/stand/loadkmap/Makefile.inc
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.6 1997/07/14 15:07:04 veego Exp $
+# $NetBSD: Makefile.inc,v 1.7 1999/02/13 02:54:38 lukem Exp $
BINDIR=/usr/share/keymaps/amiga
-NOMAN=
+MKMAN= no
CLEANFILES=${FILES}
all: ${PROG} ${FILES}
diff --git a/sys/arch/amiga/stand/loadkmap/din/Makefile b/sys/arch/amiga/stand/loadkmap/din/Makefile
index 5564f9412bb..39248c33d29 100644
--- a/sys/arch/amiga/stand/loadkmap/din/Makefile
+++ b/sys/arch/amiga/stand/loadkmap/din/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 1997/07/14 15:05:12 veego Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:38 lukem Exp $
PROG=din-kbdmap
-NOMAN=
+MKMAN= no
FILES=din.map
.include <bsd.prog.mk>
diff --git a/sys/arch/amiga/stand/loadkmap/es/Makefile b/sys/arch/amiga/stand/loadkmap/es/Makefile
index 9b6dff758a3..fdca354c50b 100644
--- a/sys/arch/amiga/stand/loadkmap/es/Makefile
+++ b/sys/arch/amiga/stand/loadkmap/es/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 1998/03/13 19:28:11 is Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:38 lukem Exp $
PROG=es-kbdmap
-NOMAN=
+MKMAN= no
FILES=es.map
.include <bsd.prog.mk>
diff --git a/sys/arch/amiga/stand/loadkmap/fr/Makefile b/sys/arch/amiga/stand/loadkmap/fr/Makefile
index 326b85be462..269c6567e83 100644
--- a/sys/arch/amiga/stand/loadkmap/fr/Makefile
+++ b/sys/arch/amiga/stand/loadkmap/fr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 1997/08/06 17:09:37 veego Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:38 lukem Exp $
PROG=fr-kbdmap
-NOMAN=
+MKMAN= no
FILES=fr.map
.include <bsd.prog.mk>
diff --git a/sys/arch/amiga/stand/loadkmap/sw/Makefile b/sys/arch/amiga/stand/loadkmap/sw/Makefile
index 5b09f9524b5..51aaba9b581 100644
--- a/sys/arch/amiga/stand/loadkmap/sw/Makefile
+++ b/sys/arch/amiga/stand/loadkmap/sw/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 1997/07/14 15:05:13 veego Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:38 lukem Exp $
PROG=sw-kbdmap
-NOMAN=
+MKMAN= no
FILES=sw.map
.include <bsd.prog.mk>
diff --git a/sys/arch/amiga/stand/loadkmap/us/Makefile b/sys/arch/amiga/stand/loadkmap/us/Makefile
index 9a948ae8a4a..5192689f6a0 100644
--- a/sys/arch/amiga/stand/loadkmap/us/Makefile
+++ b/sys/arch/amiga/stand/loadkmap/us/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 1997/07/14 15:05:14 veego Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:38 lukem Exp $
PROG=us-kbdmap
-NOMAN=
+MKMAN= no
FILES=us.map
.include <bsd.prog.mk>
diff --git a/sys/arch/atari/stand/binpatch/Makefile b/sys/arch/atari/stand/binpatch/Makefile
index 1142f88f59c..a9e714b717f 100644
--- a/sys/arch/atari/stand/binpatch/Makefile
+++ b/sys/arch/atari/stand/binpatch/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1997/06/22 05:48:14 mrg Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:39 lukem Exp $
PROG=binpatch
-NOMAN=yes
+MKMAN= no
BINDIR=/sbin
LDFLAGS+=-static
diff --git a/sys/arch/atari/stand/bootpref/Makefile b/sys/arch/atari/stand/bootpref/Makefile
index 0958b94714f..9ae23fa3a21 100644
--- a/sys/arch/atari/stand/bootpref/Makefile
+++ b/sys/arch/atari/stand/bootpref/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/05/28 12:39:23 leo Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:39 lukem Exp $
PROG= bootpref
-NOMAN= yes
+MKMAN= no
BINDIR= /usr/sbin
CFLAGS+= -Wall
diff --git a/sys/arch/atari/stand/bootxx/Makefile b/sys/arch/atari/stand/bootxx/Makefile
index 495c6cfd25d..172c66e8025 100644
--- a/sys/arch/atari/stand/bootxx/Makefile
+++ b/sys/arch/atari/stand/bootxx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 1997/04/17 07:30:08 thorpej Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:39 lukem Exp $
PROG= bootxx
SRCS= bootxx.c bsdstart.s filesystem.c
-NOMAN=
+MKMAN= no
STRIPFLAG=
BINDIR= /usr/mdec
diff --git a/sys/arch/atari/stand/edahdi/Makefile b/sys/arch/atari/stand/edahdi/Makefile
index 774c0e4ebd4..444478df5c0 100644
--- a/sys/arch/atari/stand/edahdi/Makefile
+++ b/sys/arch/atari/stand/edahdi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1997/06/22 05:48:16 mrg Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:39 lukem Exp $
PROG= edahdi
-NOMAN= yes
+MKMAN= no
DPADD= ${LIBTERMCAP}
LDADD= -ltermcap
BINDIR= /sbin
diff --git a/sys/arch/atari/stand/installboot/Makefile b/sys/arch/atari/stand/installboot/Makefile
index 68ee6c64a21..4c6cd2a3e2d 100644
--- a/sys/arch/atari/stand/installboot/Makefile
+++ b/sys/arch/atari/stand/installboot/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1997/07/09 14:31:12 leo Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:39 lukem Exp $
PROG= installboot
-NOMAN= yes
+MKMAN= no
SRCS= installboot.c disklabel.c
BINDIR= /usr/mdec
LDADD= -lkvm
diff --git a/sys/arch/atari/stand/libsa/Makefile b/sys/arch/atari/stand/libsa/Makefile
index b40a33b7c13..5f3e928e6ba 100644
--- a/sys/arch/atari/stand/libsa/Makefile
+++ b/sys/arch/atari/stand/libsa/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 1997/05/31 21:22:04 cjs Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:42 lukem Exp $
LIB= sa
-NOPIC=
-NOPROFILE=
+MKPIC=no
+MKPROFILE=no
OBJMACHINE=
CPPFLAGS+= ${DEFS} ${INCL}
diff --git a/sys/arch/atari/stand/loadkmap/Makefile b/sys/arch/atari/stand/loadkmap/Makefile
index f869baf967a..b2fda7110de 100644
--- a/sys/arch/atari/stand/loadkmap/Makefile
+++ b/sys/arch/atari/stand/loadkmap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 1996/06/22 20:21:55 leo Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:42 lukem Exp $
PROG=loadkmap
-NOMAN=loadkmap
+MKMAN= no
BINDIR=/usr/sbin
LDFLAGS+=-static
diff --git a/sys/arch/atari/stand/msconfig/Makefile b/sys/arch/atari/stand/msconfig/Makefile
index bfde7d37655..ea8cea4429c 100644
--- a/sys/arch/atari/stand/msconfig/Makefile
+++ b/sys/arch/atari/stand/msconfig/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 1997/06/22 05:48:20 mrg Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:42 lukem Exp $
PROG= msconfig
-NOMAN= yes
+MKMAN= no
BINDIR= /usr/bin
CFLAGS+=-Wall
diff --git a/sys/arch/atari/stand/xxboot/ahdi-sdb00t/Makefile b/sys/arch/atari/stand/xxboot/ahdi-sdb00t/Makefile
index 5e7a751ff0a..e3e5550e1b2 100644
--- a/sys/arch/atari/stand/xxboot/ahdi-sdb00t/Makefile
+++ b/sys/arch/atari/stand/xxboot/ahdi-sdb00t/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 1996/06/29 20:48:56 leo Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:43 lukem Exp $
PROG= sdb00t.ahdi
SRCS= ${.CURDIR}/sdb00t.ahdi.s
-NOMAN=
+MKMAN= no
LIBCRT0=
INCL= -I${.CURDIR} -I${.CURDIR}/..
diff --git a/sys/arch/atari/stand/xxboot/ahdi-wdb00t/Makefile b/sys/arch/atari/stand/xxboot/ahdi-wdb00t/Makefile
index dddc60b30fa..12795e58565 100644
--- a/sys/arch/atari/stand/xxboot/ahdi-wdb00t/Makefile
+++ b/sys/arch/atari/stand/xxboot/ahdi-wdb00t/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 1996/06/29 20:49:00 leo Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:43 lukem Exp $
PROG= wdb00t.ahdi
SRCS= ${.CURDIR}/wdb00t.ahdi.s
-NOMAN=
+MKMAN= no
LIBCRT0=
INCL= -I${.CURDIR} -I${.CURDIR}/..
diff --git a/sys/arch/atari/stand/xxboot/ahdi-xxboot/Makefile b/sys/arch/atari/stand/xxboot/ahdi-xxboot/Makefile
index 7f4de6b511c..d2130e894ea 100644
--- a/sys/arch/atari/stand/xxboot/ahdi-xxboot/Makefile
+++ b/sys/arch/atari/stand/xxboot/ahdi-xxboot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 1996/06/29 20:49:02 leo Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:43 lukem Exp $
PROG= xxboot.ahdi
SRCS= ${.CURDIR}/xxboot.ahdi.s
-NOMAN=
+MKMAN= no
LIBCRT0=
INCL= -I${.CURDIR} -I${.CURDIR}/..
diff --git a/sys/arch/atari/stand/xxboot/fdboot/Makefile b/sys/arch/atari/stand/xxboot/fdboot/Makefile
index 40b2a7bcf0e..d2a19aa405d 100644
--- a/sys/arch/atari/stand/xxboot/fdboot/Makefile
+++ b/sys/arch/atari/stand/xxboot/fdboot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 1996/06/29 20:49:05 leo Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:43 lukem Exp $
PROG= fdboot
SRCS= ${.CURDIR}/fdboot.s
-NOMAN=
+MKMAN= no
LIBCRT0=
INCL= -I${.CURDIR} -I${.CURDIR}/..
diff --git a/sys/arch/atari/stand/xxboot/sdboot/Makefile b/sys/arch/atari/stand/xxboot/sdboot/Makefile
index 6182016dd90..8ac3e369016 100644
--- a/sys/arch/atari/stand/xxboot/sdboot/Makefile
+++ b/sys/arch/atari/stand/xxboot/sdboot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 1996/06/29 20:49:08 leo Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:43 lukem Exp $
PROG= sdboot
SRCS= ${.CURDIR}/sdboot.s
-NOMAN=
+MKMAN= no
LIBCRT0=
INCL= -I${.CURDIR} -I${.CURDIR}/..
diff --git a/sys/arch/atari/stand/xxboot/wdboot/Makefile b/sys/arch/atari/stand/xxboot/wdboot/Makefile
index ada38304b6b..3a776023dc8 100644
--- a/sys/arch/atari/stand/xxboot/wdboot/Makefile
+++ b/sys/arch/atari/stand/xxboot/wdboot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 1996/06/29 20:49:11 leo Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:43 lukem Exp $
PROG= wdboot
SRCS= ${.CURDIR}/wdboot.s
-NOMAN=
+MKMAN= no
LIBCRT0=
INCL= -I${.CURDIR} -I${.CURDIR}/..
diff --git a/sys/arch/bebox/stand/boot/Makefile b/sys/arch/bebox/stand/boot/Makefile
index b550a598647..dfc768c691e 100644
--- a/sys/arch/bebox/stand/boot/Makefile
+++ b/sys/arch/bebox/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/10/26 00:45:47 sakamoto Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:43 lukem Exp $
S= ${.CURDIR}/../../../..
@@ -21,7 +21,7 @@ CPPFLAGS+= -DCONS_VGA
#CPPFLAGS+= -DUSE_SCAN
AFLAGS= -x assembler-with-cpp -traditional-cpp
-NOMAN=
+MKMAN= no
STRIPFLAG=
BINMODE= 444
diff --git a/sys/arch/hp300/stand/Makefile.buildboot b/sys/arch/hp300/stand/Makefile.buildboot
index 293a351d325..c39b059e58f 100644
--- a/sys/arch/hp300/stand/Makefile.buildboot
+++ b/sys/arch/hp300/stand/Makefile.buildboot
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.buildboot,v 1.4 1997/05/09 07:50:30 mycroft Exp $
+# $NetBSD: Makefile.buildboot,v 1.5 1999/02/13 02:54:43 lukem Exp $
S= ${.CURDIR}/../../../..
@@ -7,7 +7,7 @@ S= ${.CURDIR}/../../../..
PROG= ${PROGAOUT}.lif
SRCS= ${COMMONSOURCE} ${DRIVERSOURCE} ${PROGSOURCE}
-NOMAN=
+MKMAN= no
STRIPFLAG=
BINMODE= 444
diff --git a/sys/arch/hp300/stand/installboot/Makefile b/sys/arch/hp300/stand/installboot/Makefile
index 72314dadcaa..42dcf8d801f 100644
--- a/sys/arch/hp300/stand/installboot/Makefile
+++ b/sys/arch/hp300/stand/installboot/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 1997/02/04 03:52:59 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:44 lukem Exp $
-NOMAN=
+MKMAN= no
beforeinstall:
${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/sys/arch/hp300/stand/mkboot/Makefile b/sys/arch/hp300/stand/mkboot/Makefile
index 462d55689f7..2aa73fb3afb 100644
--- a/sys/arch/hp300/stand/mkboot/Makefile
+++ b/sys/arch/hp300/stand/mkboot/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 1998/03/02 20:02:25 cgd Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:44 lukem Exp $
.include <bsd.own.mk>
PROG= mkboot
-NOMAN=
+MKMAN= no
LDSTATIC?=-static
diff --git a/sys/arch/i386/isa/pcvt/Util/cursor/Makefile b/sys/arch/i386/isa/pcvt/Util/cursor/Makefile
index 49786a2628e..be8528998ef 100644
--- a/sys/arch/i386/isa/pcvt/Util/cursor/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/cursor/Makefile
@@ -1,5 +1,4 @@
PROG= cursor
-
-NOMAN= yes
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/sys/arch/i386/isa/pcvt/Util/demo/Makefile b/sys/arch/i386/isa/pcvt/Util/demo/Makefile
index 79f7397e6dd..515d629f44a 100644
--- a/sys/arch/i386/isa/pcvt/Util/demo/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/demo/Makefile
@@ -2,7 +2,7 @@ PROG= playvt
SRCS= playvt.c
DEMOS= chardemo.vt colors.vt sgr.vt
DEMOS+= outerlimit.vt twzone.vt cowscene.vt xmas.vt
-NOMAN=
+MKMAN= no
all: $(DEMOS) $(PROG)
diff --git a/sys/arch/i386/isa/pcvt/Util/fed/Makefile b/sys/arch/i386/isa/pcvt/Util/fed/Makefile
index 94fad8b4f41..ec47e3ce48b 100644
--- a/sys/arch/i386/isa/pcvt/Util/fed/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/fed/Makefile
@@ -3,6 +3,6 @@ SRCS= fed.c select.c edit.c misc.c
LDADD= -lncurses
BINDIR= /usr/local/bin
-NOMAN= yes
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/sys/arch/i386/isa/pcvt/Util/fontedit/Makefile b/sys/arch/i386/isa/pcvt/Util/fontedit/Makefile
index ebc780b9f9b..d6cdc996004 100644
--- a/sys/arch/i386/isa/pcvt/Util/fontedit/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/fontedit/Makefile
@@ -1,7 +1,7 @@
PROG= fontedit
CLEANFILES+= core.fontedit fontedit.core
-NOMAN= yes
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/sys/arch/i386/isa/pcvt/Util/ispcvt/Makefile b/sys/arch/i386/isa/pcvt/Util/ispcvt/Makefile
index d29de286a24..9e9dd1b3acf 100644
--- a/sys/arch/i386/isa/pcvt/Util/ispcvt/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/ispcvt/Makefile
@@ -1,6 +1,6 @@
PROG= ispcvt
-NOMAN= yes
+MKMAN= no
BINDIR= /usr/sbin
diff --git a/sys/arch/i386/isa/pcvt/Util/kbdio/Makefile b/sys/arch/i386/isa/pcvt/Util/kbdio/Makefile
index d2299199910..39bb29e195d 100644
--- a/sys/arch/i386/isa/pcvt/Util/kbdio/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/kbdio/Makefile
@@ -10,8 +10,8 @@ LFLAGS+= -I
LDADD= -lm -ly -ll
DPADD= ${LIBM} ${LIBY} ${LIBL}
-NOMAN=
-NOSHARED= no shared linkage
+MKMAN= no
+MKPIC= no
CFLAGS+= -I. #-g
YFLAGS+= -d
@@ -19,8 +19,6 @@ YFLAGS+= -d
CLEANFILES+= y.tab.h
CLEANFILES+= y.output # comment file from bison
-NOMAN= yes
-
.include <bsd.prog.mk>
lex.o: y.tab.h lex.l
diff --git a/sys/arch/i386/isa/pcvt/Util/kcon/Makefile b/sys/arch/i386/isa/pcvt/Util/kcon/Makefile
index ec48c5f0bc9..d8f706a4301 100644
--- a/sys/arch/i386/isa/pcvt/Util/kcon/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/kcon/Makefile
@@ -2,7 +2,7 @@ PROG= kcon
DEVICE= /dev/ttyv0
CFLAGS+= -I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\"
-NOMAN= yes
+MKMAN= no
KEYCAPOBJDIR!= cd ${.CURDIR}/../keycap; make print-objdir
diff --git a/sys/arch/i386/isa/pcvt/Util/keycap/Makefile b/sys/arch/i386/isa/pcvt/Util/keycap/Makefile
index 5af5b0df4d0..69412e96d01 100644
--- a/sys/arch/i386/isa/pcvt/Util/keycap/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/keycap/Makefile
@@ -5,7 +5,7 @@ KEYCAPSRC= keycap.src
CPPFLAGS+= -DKEYCAP_PATH=\"$(CAPPATH)\"
SRCS = keycap.c
-NOMAN= yes
+MKMAN= no
beforeinstall:
@if [ ! -d ${DESTDIR}${CAPDIR} ]; then mkdir ${DESTDIR}${CAPDIR};fi
diff --git a/sys/arch/i386/isa/pcvt/Util/loadfont/Makefile b/sys/arch/i386/isa/pcvt/Util/loadfont/Makefile
index 66b7f3d008d..be52b6dee40 100644
--- a/sys/arch/i386/isa/pcvt/Util/loadfont/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/loadfont/Makefile
@@ -1,5 +1,5 @@
PROG= loadfont
-NOMAN= yes
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/sys/arch/i386/isa/pcvt/Util/mcon/Makefile b/sys/arch/i386/isa/pcvt/Util/mcon/Makefile
index aaef6c45335..43b740d0052 100644
--- a/sys/arch/i386/isa/pcvt/Util/mcon/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/mcon/Makefile
@@ -1,5 +1,5 @@
PROG= mcon
-NOMAN= yes
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/sys/arch/i386/isa/pcvt/Util/scon/Makefile b/sys/arch/i386/isa/pcvt/Util/scon/Makefile
index 3748baaf9d4..3015544a88f 100644
--- a/sys/arch/i386/isa/pcvt/Util/scon/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/scon/Makefile
@@ -1,5 +1,5 @@
PROG= scon
-NOMAN= yes
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/sys/arch/i386/isa/pcvt/Util/set2061/Makefile b/sys/arch/i386/isa/pcvt/Util/set2061/Makefile
index 3a1c92aa560..8a586a75a3e 100644
--- a/sys/arch/i386/isa/pcvt/Util/set2061/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/set2061/Makefile
@@ -1,7 +1,7 @@
PROG= set2061
SRCS= main.c ICD2061Aalt.c
CFLAGS+= -DGCCUSESGAS -DPCVT_STANDALONE
-NOMAN=
+MKMAN= no
all: $(PROG)
diff --git a/sys/arch/i386/isa/pcvt/Util/userkeys/Makefile b/sys/arch/i386/isa/pcvt/Util/userkeys/Makefile
index 3b402797b9b..e96284bafda 100644
--- a/sys/arch/i386/isa/pcvt/Util/userkeys/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/userkeys/Makefile
@@ -1,5 +1,5 @@
PROG= vt220keys
-NOMAN= yes
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/sys/arch/i386/isa/pcvt/Util/vgaio/Makefile b/sys/arch/i386/isa/pcvt/Util/vgaio/Makefile
index 698e57f728c..d790e8115f8 100644
--- a/sys/arch/i386/isa/pcvt/Util/vgaio/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/vgaio/Makefile
@@ -17,6 +17,6 @@ YFLAGS+= -d
CLEANFILES+= y.tab.h
CLEANFILES+= y.output # comment file from bison
-NOMAN= yes
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/sys/arch/i386/isa/pcvt/Util/vttest/Makefile b/sys/arch/i386/isa/pcvt/Util/vttest/Makefile
index a98cf335cb8..bae6fb0cf83 100644
--- a/sys/arch/i386/isa/pcvt/Util/vttest/Makefile
+++ b/sys/arch/i386/isa/pcvt/Util/vttest/Makefile
@@ -1,6 +1,6 @@
PROG= vttest
SRCS= main.c esc.c
-NOMAN= yes
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/sys/arch/i386/stand/biosboot/Makefile b/sys/arch/i386/stand/biosboot/Makefile
index 81b2ab0156f..b741c00b12d 100644
--- a/sys/arch/i386/stand/biosboot/Makefile
+++ b/sys/arch/i386/stand/biosboot/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 1999/01/30 17:43:38 christos Exp $
+# $NetBSD: Makefile,v 1.17 1999/02/13 02:54:46 lukem Exp $
S= ${.CURDIR}/../../../../
BASE= biosboot
PROG= ${BASE}.sym
-NOMAN=
+MKMAN= no
NEWVERSWHAT= "BIOS Boot"
SRCS= main.c devopen.c conf.c exec.c
diff --git a/sys/arch/i386/stand/dosboot/Makefile b/sys/arch/i386/stand/dosboot/Makefile
index ae3a4c6f9bd..b71a748e605 100644
--- a/sys/arch/i386/stand/dosboot/Makefile
+++ b/sys/arch/i386/stand/dosboot/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 1999/01/30 17:44:10 christos Exp $
+# $NetBSD: Makefile,v 1.11 1999/02/13 02:54:46 lukem Exp $
S= ${.CURDIR}/../../../../
BASE= dosboot
PROG= ${BASE}.com
-NOMAN=
+MKMAN= no
NEWVERSWHAT= "DOS Boot"
SRCS= main.c devopen.c exec.c
diff --git a/sys/arch/i386/stand/genprom/Makefile b/sys/arch/i386/stand/genprom/Makefile
index a22046ece7a..07b466a1631 100644
--- a/sys/arch/i386/stand/genprom/Makefile
+++ b/sys/arch/i386/stand/genprom/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 1997/08/20 16:53:30 drochner Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:46 lukem Exp $
PROG= genprom
-NOMAN=
+MKMAN= no
CFLAGS+= -Wall
diff --git a/sys/arch/i386/stand/lib/Makefile b/sys/arch/i386/stand/lib/Makefile
index 1a8844745d5..d310103d6e4 100644
--- a/sys/arch/i386/stand/lib/Makefile
+++ b/sys/arch/i386/stand/lib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 1999/01/30 17:46:53 christos Exp $
+# $NetBSD: Makefile,v 1.10 1999/02/13 02:54:46 lukem Exp $
S?= ${.CURDIR}/../../../../
LIB= i386
-NOPIC=
-NOPROFILE=
+MKPIC=no
+MKPROFILE=no
I386_INCLUDE_DISK?= yes
I386_INCLUDE_DOS?= no
diff --git a/sys/arch/i386/stand/netboot/Makefile b/sys/arch/i386/stand/netboot/Makefile
index 1e3d5a82014..421fe769b83 100644
--- a/sys/arch/i386/stand/netboot/Makefile
+++ b/sys/arch/i386/stand/netboot/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.17 1998/12/12 15:51:49 drochner Exp $
+# $NetBSD: Makefile,v 1.18 1999/02/13 02:54:46 lukem Exp $
S= ${.CURDIR}/../../../../
BASE= netboot
PROG= ${BASE}.rom
-NOMAN=
+MKMAN= no
NEWVERSWHAT= "Network Boot"
SRCS= main.c devopen.c conf.c dev_net.c
diff --git a/sys/arch/macppc/stand/bootxx/Makefile b/sys/arch/macppc/stand/bootxx/Makefile
index 4935032a6b1..585db9bf6c8 100644
--- a/sys/arch/macppc/stand/bootxx/Makefile
+++ b/sys/arch/macppc/stand/bootxx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 1998/06/12 21:07:24 tsubai Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:46 lukem Exp $
PROG= bootxx
-NOMAN=
+MKMAN= no
STRIPFLAG=
BINMODE=444
diff --git a/sys/arch/macppc/stand/installboot/Makefile b/sys/arch/macppc/stand/installboot/Makefile
index cc633bf5f45..c1d7e5a195d 100644
--- a/sys/arch/macppc/stand/installboot/Makefile
+++ b/sys/arch/macppc/stand/installboot/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 1998/06/12 21:07:24 tsubai Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:47 lukem Exp $
PROG= installboot
-NOMAN=
+MKMAN= no
LDSTATIC= -static
diff --git a/sys/arch/macppc/stand/ofwboot/Makefile b/sys/arch/macppc/stand/ofwboot/Makefile
index f7bec1276da..6ed186ac9d8 100644
--- a/sys/arch/macppc/stand/ofwboot/Makefile
+++ b/sys/arch/macppc/stand/ofwboot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/06/26 12:29:29 tsubai Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:47 lukem Exp $
S= ${.CURDIR}/../../../..
@@ -7,7 +7,7 @@ SRCS= Locore.c boot.c ofdev.c net.c netif_of.c alloc.c
.PATH: ${S}/arch/powerpc/powerpc
SRCS+= ofwmagic.S
#CFLAGS+= -DDEBUG -DNETIF_DEBUG
-NOMAN=
+MKMAN= no
STRIPFLAG=
BINMODE= 444
OBJCOPY?= objcopy
diff --git a/sys/arch/mvme68k/stand/installboot/Makefile b/sys/arch/mvme68k/stand/installboot/Makefile
index 0584a5fa76b..3049177cf9b 100644
--- a/sys/arch/mvme68k/stand/installboot/Makefile
+++ b/sys/arch/mvme68k/stand/installboot/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 1998/03/02 19:57:01 cgd Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:47 lukem Exp $
.include <bsd.own.mk>
PROG= installboot
-NOMAN= yes
+MKMAN= no
BINDIR=/usr/mdec
# Need this to work in the miniroot
diff --git a/sys/arch/mvme68k/stand/libbug/Makefile b/sys/arch/mvme68k/stand/libbug/Makefile
index 999b6e09735..806d5186c58 100644
--- a/sys/arch/mvme68k/stand/libbug/Makefile
+++ b/sys/arch/mvme68k/stand/libbug/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 1998/08/01 11:22:52 scw Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:47 lukem Exp $
LIB=bug
-NOPIC=
-NOPROFILE=
+MKPIC=no
+MKPROFILE=no
S=${.CURDIR}/../../../..
DIR_SA=$S/lib/libsa
diff --git a/sys/arch/mvme68k/stand/libsa/Makefile b/sys/arch/mvme68k/stand/libsa/Makefile
index 5ce559d222c..0a429c0bef7 100644
--- a/sys/arch/mvme68k/stand/libsa/Makefile
+++ b/sys/arch/mvme68k/stand/libsa/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 1998/08/01 11:22:52 scw Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:47 lukem Exp $
LIB=sa
CLEANFILES+=SRT0.o
-NOPIC=nopic
-NOPROFILE=noprofile
+MKPIC=no
+MKPROFILE=no
# Logically src/sys
S=${.CURDIR}/../../../..
diff --git a/sys/arch/mvme68k/stand/prtvid/Makefile b/sys/arch/mvme68k/stand/prtvid/Makefile
index 987516c0b1e..d01f370dffc 100644
--- a/sys/arch/mvme68k/stand/prtvid/Makefile
+++ b/sys/arch/mvme68k/stand/prtvid/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 1997/05/07 15:59:10 mycroft Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:47 lukem Exp $
PROG= prtvid
-NOMAN=
+MKMAN= no
# only needed during build
proginstall::
diff --git a/sys/arch/mvme68k/stand/sboot/Makefile b/sys/arch/mvme68k/stand/sboot/Makefile
index f34434454e5..c07c7e4e0a6 100644
--- a/sys/arch/mvme68k/stand/sboot/Makefile
+++ b/sys/arch/mvme68k/stand/sboot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/08/01 11:22:53 scw Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:47 lukem Exp $
#
# sboot would like a newer GNU ld because it can generate S-Records.
@@ -7,7 +7,7 @@
COMPILE.s= $(AS) $(ASFLAGS) -o $*.o
LDFLAGS=-x -N -Ttext 0x4000 -e start
-NOMAN=
+MKMAN= no
SRCS= start.s clock.c console.c etherfun.c le_poll.c libc_sa.c \
oc_cksum.s sboot.c
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
diff --git a/sys/arch/mvme68k/stand/wrtvid/Makefile b/sys/arch/mvme68k/stand/wrtvid/Makefile
index 5be4781cc32..d0cb08673e0 100644
--- a/sys/arch/mvme68k/stand/wrtvid/Makefile
+++ b/sys/arch/mvme68k/stand/wrtvid/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 1997/05/07 15:59:11 mycroft Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:47 lukem Exp $
PROG= wrtvid
-NOMAN=
+MKMAN= no
# only needed during build
proginstall::
diff --git a/sys/arch/next68k/stand/boot/Makefile b/sys/arch/next68k/stand/boot/Makefile
index f4b5ff342d4..7bfed0e9bc3 100644
--- a/sys/arch/next68k/stand/boot/Makefile
+++ b/sys/arch/next68k/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/09/14 00:50:22 tv Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:48 lukem Exp $
S= ${.CURDIR}/../../../..
@@ -37,7 +37,7 @@ SRCS= boot.c machdep.c conf.c devopen.c rtc.c sd.c scsi.c en.c dev_net.c
# @@@ dev_net.c should really be in libsa, but it doesn't
# declare ip_convertaddr correctly, so I put it here _temporarily_.
-NOMAN= 1
+MKMAN= no
BINDIR= /usr/mdec
#LIBS= ${SALIB} ${KERNLIB} ${ZLIB}
LIBS= ${SALIB} ${KERNLIB}
diff --git a/sys/arch/ofppc/stand/ofwboot/Makefile b/sys/arch/ofppc/stand/ofwboot/Makefile
index fa071b40db0..5e87972a884 100644
--- a/sys/arch/ofppc/stand/ofwboot/Makefile
+++ b/sys/arch/ofppc/stand/ofwboot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/06/09 04:27:53 sakamoto Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:48 lukem Exp $
S= ${.CURDIR}/../../../..
@@ -8,7 +8,7 @@ SRCS= Locore.c boot.c ofdev.c net.c netif_of.c alloc.c
SRCS+= ofwmagic.S
.PATH: ${S}/arch/powerpc/powerpc
#CFLAGS+= -DDEBUG -DNETIF_DEBUG
-NOMAN=
+MKMAN= no
STRIPFLAG=
BINMODE= 444
diff --git a/sys/arch/pc532/stand/Makefile.buildboot b/sys/arch/pc532/stand/Makefile.buildboot
index be35321702e..d25488892c6 100644
--- a/sys/arch/pc532/stand/Makefile.buildboot
+++ b/sys/arch/pc532/stand/Makefile.buildboot
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.buildboot,v 1.1 1997/05/17 13:55:34 matthias Exp $
+# $NetBSD: Makefile.buildboot,v 1.2 1999/02/13 02:54:48 lukem Exp $
S= ${.CURDIR}/../../../..
.PATH: ${.CURDIR}/../common
SRCS= ${COMMONSOURCE} ${DRIVERSOURCE} ${PROGSOURCE}
-NOMAN=
+MKMAN= no
STRIP=
BINMODE= 444
diff --git a/sys/arch/pmax/stand/libsa/Makefile b/sys/arch/pmax/stand/libsa/Makefile
index 6d2ef5b62ab..805aaa68727 100644
--- a/sys/arch/pmax/stand/libsa/Makefile
+++ b/sys/arch/pmax/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/01/30 12:23:10 simonb Exp $
+# $NetBSD: Makefile,v 1.11 1999/02/13 02:54:48 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 2/16/94
S= ${.CURDIR}/../../../..
@@ -13,9 +13,9 @@ SRCS+= bzero.c disklabel.c dkcksum.c open.c
.PATH: $S/lib/libsa $S/lib/libkern
# set up for standalone library compiation (turn off PIC)
-NOPROFILE=noprofile
-NOPIC =nopic
-NOLINT =nolint
+MKPROFILE=no
+MKPIC= no
+MKLINT= no
# only needed during build - prevent installation of library
libinstall::
diff --git a/sys/arch/pmax/stand/scsiboot/Makefile b/sys/arch/pmax/stand/scsiboot/Makefile
index 78a2aed4750..5b4f4d3162d 100644
--- a/sys/arch/pmax/stand/scsiboot/Makefile
+++ b/sys/arch/pmax/stand/scsiboot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/01/22 14:05:06 simonb Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:48 lukem Exp $
# @(#)Makefile 8.3 (Berkeley) 2/16/94
@@ -8,7 +8,7 @@ SRCS= start.S boot.c bootconf.c filesystem.c
CLEANFILES+=${PROG}.elf ${PROG}.map bootconf.c ${ALL}
DPADD+= ${LIBS}
-NOMAN= noman # XXX: Should have one
+MKMAN= no
LDBUG= -T $S/arch/mips/conf/stand.ldscript
# Tell boot code which drivers we want to link against
diff --git a/sys/arch/sparc/stand/Makefile.buildboot b/sys/arch/sparc/stand/Makefile.buildboot
index dd975479230..d9e846a6472 100644
--- a/sys/arch/sparc/stand/Makefile.buildboot
+++ b/sys/arch/sparc/stand/Makefile.buildboot
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.buildboot,v 1.2 1999/02/06 13:34:15 hannken Exp $
+# $NetBSD: Makefile.buildboot,v 1.3 1999/02/13 02:54:48 lukem Exp $
S= ${.CURDIR}/../../../..
@@ -7,7 +7,7 @@ S= ${.CURDIR}/../../../..
COMMONSOURCE= srt0.S promdev.c dvma.c
SRCS= ${COMMONSOURCE} ${PROGSOURCE}
-NOMAN=
+MKMAN= no
BINMODE= 444
RELOC_SUN4= 0x240000
diff --git a/sys/arch/sparc/stand/binstall/Makefile b/sys/arch/sparc/stand/binstall/Makefile
index c300d1d342d..f30b0e4d82a 100644
--- a/sys/arch/sparc/stand/binstall/Makefile
+++ b/sys/arch/sparc/stand/binstall/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 1997/06/01 03:39:23 mrg Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:49 lukem Exp $
-NOMAN= XXX should have one
+MKMAN= no
SCRIPTS= binstall.sh
diff --git a/sys/arch/sparc/stand/installboot/Makefile b/sys/arch/sparc/stand/installboot/Makefile
index 5216489627e..13a24cde5c3 100644
--- a/sys/arch/sparc/stand/installboot/Makefile
+++ b/sys/arch/sparc/stand/installboot/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 1998/12/11 12:18:46 mrg Exp $
+# $NetBSD: Makefile,v 1.8 1999/02/13 02:54:49 lukem Exp $
.include <bsd.own.mk>
PROG= installboot
-NOMAN= built in share/man/man8/man8.sparc
+MKMAN= no
LDSTATIC?= -static
diff --git a/sys/arch/sparc64/stand/bootblk/Makefile b/sys/arch/sparc64/stand/bootblk/Makefile
index d7cef8ced64..dca610c6250 100644
--- a/sys/arch/sparc64/stand/bootblk/Makefile
+++ b/sys/arch/sparc64/stand/bootblk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/11/24 12:56:40 mrg Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:49 lukem Exp $
CURDIR= ${.CURDIR}
S= ${CURDIR}/../../../..
@@ -14,7 +14,7 @@ NM=nm
PROG= bootblk bootblk.text
SRCS= bootblk.fth
-NOMAN=
+MKMAN= no
# deal with Solaris vs. NetBSD build environments for now ..
OS!=uname -s
diff --git a/sys/arch/sparc64/stand/installboot/Makefile b/sys/arch/sparc64/stand/installboot/Makefile
index 6df250f1d2d..80fb37650c8 100644
--- a/sys/arch/sparc64/stand/installboot/Makefile
+++ b/sys/arch/sparc64/stand/installboot/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 1998/12/11 12:14:22 mrg Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:49 lukem Exp $
-NOMAN= built in share/man/man8/man8.sparc64
+MKMAN= no
SCRIPTS= installboot.sh
.include <bsd.prog.mk>
diff --git a/sys/arch/sparc64/stand/ofwboot/Makefile b/sys/arch/sparc64/stand/ofwboot/Makefile
index 3cc0601d63d..9ec273b2256 100644
--- a/sys/arch/sparc64/stand/ofwboot/Makefile
+++ b/sys/arch/sparc64/stand/ofwboot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/01/17 20:07:52 eeh Exp $
+# $NetBSD: Makefile,v 1.9 1999/02/13 02:54:49 lukem Exp $
CURDIR= ${.CURDIR}
S= ${CURDIR}/../../../..
@@ -20,7 +20,7 @@ CEXTRAFLAG= -D_LP64
.endif
CFLAGS+= ${COPTS} -DNETIF_DEBUG -D__ELF__ -D_STANDALONE
-NOMAN=
+MKMAN= no
STRIPFLAG=
BINMODE= 444
OBJCOPY?= objcopy
diff --git a/sys/arch/sun3/stand/installboot/Makefile b/sys/arch/sun3/stand/installboot/Makefile
index 6cbb7eed9cb..6b9c6e67d4b 100644
--- a/sys/arch/sun3/stand/installboot/Makefile
+++ b/sys/arch/sun3/stand/installboot/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 1998/03/02 19:57:01 cgd Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:49 lukem Exp $
.include <bsd.own.mk>
PROG= installboot
-NOMAN= yes
+MKMAN= no
BINDIR=/usr/mdec
# Need this to work in the miniroot
diff --git a/sys/arch/sun3/stand/libsa/Makefile b/sys/arch/sun3/stand/libsa/Makefile
index 18ba43f9b4c..1c3ddc432ee 100644
--- a/sys/arch/sun3/stand/libsa/Makefile
+++ b/sys/arch/sun3/stand/libsa/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 1998/07/02 21:36:00 gwr Exp $
+# $NetBSD: Makefile,v 1.20 1999/02/13 02:54:49 lukem Exp $
LIB=sa
-NOLINT= nolint (XXX should be linted)
-NOPIC=
-NOPROFILE=
+MKLINT=no
+MKPIC=no
+MKPROFILE=no
# Logically src/sys
S=${.CURDIR}/../../../..
diff --git a/sys/arch/x68k/stand/libdos/Makefile b/sys/arch/x68k/stand/libdos/Makefile
index 7a86c263ef9..036e3d0d81f 100644
--- a/sys/arch/x68k/stand/libdos/Makefile
+++ b/sys/arch/x68k/stand/libdos/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 1998/09/01 19:53:25 itohy Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:49 lukem Exp $
LIB= dos
-NOLINT=
-NOPROFILE=
-NOPIC=
+MKLINT=no
+MKPROFILE=no
+MKPIC=no
CPPFLAGS+= -I${.CURDIR}
diff --git a/sys/arch/x68k/stand/libiocs/Makefile b/sys/arch/x68k/stand/libiocs/Makefile
index 0d0109e4c0b..f29798d9aef 100644
--- a/sys/arch/x68k/stand/libiocs/Makefile
+++ b/sys/arch/x68k/stand/libiocs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 1998/09/01 19:53:54 itohy Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:50 lukem Exp $
LIB= iocs
-NOLINT=
-NOPROFILE=
-NOPIC=
+MKLINT=no
+MKPROFILE=no
+MKPIC=no
AWK?= awk
diff --git a/sys/arch/x68k/stand/loadbsd/Makefile b/sys/arch/x68k/stand/loadbsd/Makefile
index a2a5b3a5ea8..f289cc7713e 100644
--- a/sys/arch/x68k/stand/loadbsd/Makefile
+++ b/sys/arch/x68k/stand/loadbsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1998/11/20 10:59:22 itohy Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:50 lukem Exp $
BASE= loadbsd
PROG= ${BASE}.x # Human68k ".x" executable
@@ -6,7 +6,7 @@ STRIPFLAG= # not an a.out
BINMODE=444 # not to be run on NetBSD
SRCS= start.S loadbsd.c xprintf.c trampoline.S
-NOMAN= noman
+MKMAN= no
BINDIR= /usr/mdec
.PATH: ${.CURDIR}/../common
diff --git a/sys/arch/x68k/stand/xxboot/Makefile b/sys/arch/x68k/stand/xxboot/Makefile
index 1316a05b255..721dfe252b8 100644
--- a/sys/arch/x68k/stand/xxboot/Makefile
+++ b/sys/arch/x68k/stand/xxboot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1998/09/01 20:02:32 itohy Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:50 lukem Exp $
BOOT= xxboot
VERSION=0.3
@@ -15,7 +15,7 @@ STRIPFLAG=
BINMODE= 444
SCRIPTSMODE= 555
SCRIPTS= installboot.sh
-NOMAN= noman
+MKMAN= no
STRIP?= strip
diff --git a/sys/arch/x68k/stand/xxboot/gunzip/Makefile.test b/sys/arch/x68k/stand/xxboot/gunzip/Makefile.test
index c8325a97113..4066d14b50b 100644
--- a/sys/arch/x68k/stand/xxboot/gunzip/Makefile.test
+++ b/sys/arch/x68k/stand/xxboot/gunzip/Makefile.test
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.test,v 1.1 1998/09/01 20:03:46 itohy Exp $
+# $NetBSD: Makefile.test,v 1.2 1999/02/13 02:54:50 lukem Exp $
#
# Makefile for test
PROG= zcat
SRCS= main.c unzip.c inflate.c
-NOMAN= noman
+MKMAN= no
CFLAGS= -Wall -O -fomit-frame-pointer -DBOOT -DTEST
LDFLAGS= -static -N
diff --git a/sys/arch/x68k/usr.bin/bellctrl/Makefile b/sys/arch/x68k/usr.bin/bellctrl/Makefile
index 94a23333d52..e2ce6a47ccd 100644
--- a/sys/arch/x68k/usr.bin/bellctrl/Makefile
+++ b/sys/arch/x68k/usr.bin/bellctrl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/08/04 16:39:55 minoura Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:50 lukem Exp $
#
# Makefile for bellctrl
@@ -10,8 +10,8 @@ sample.fm: sample_fm.c
dd bs=1 skip=32 count=52 if=sample.aout of=$@
rm sample.aout
-PROG = bellctrl
-NOMAN= yes
+PROG= bellctrl
+MKMAN= no
CPPFLAGS+=-I${.CURDIR}/../../..
CLEANFILES+=sample.fm
diff --git a/sys/arch/x68k/usr.bin/loadfont/Makefile b/sys/arch/x68k/usr.bin/loadfont/Makefile
index 5def726de6d..f6b9bd2a022 100644
--- a/sys/arch/x68k/usr.bin/loadfont/Makefile
+++ b/sys/arch/x68k/usr.bin/loadfont/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 1997/06/22 07:09:02 mrg Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:50 lukem Exp $
PROG=loadfont
-NOMAN= yes
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/sys/arch/x68k/usr.bin/loadkmap/Makefile b/sys/arch/x68k/usr.bin/loadkmap/Makefile
index dac54c7bd9c..f08021545d9 100644
--- a/sys/arch/x68k/usr.bin/loadkmap/Makefile
+++ b/sys/arch/x68k/usr.bin/loadkmap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 1998/08/04 16:39:55 minoura Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:50 lukem Exp $
# Makefile for loadkmap
PROG= loadkmap
-NOMAN= yes
+MKMAN= no
FILES= ascii_kmap jis_kmap
FILESDIR= /usr/share/keymaps/x68k
diff --git a/sys/arch/x68k/usr.bin/palette/Makefile b/sys/arch/x68k/usr.bin/palette/Makefile
index 92d90f7879e..9d5614cd5ae 100644
--- a/sys/arch/x68k/usr.bin/palette/Makefile
+++ b/sys/arch/x68k/usr.bin/palette/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 1997/06/22 07:09:05 mrg Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:51 lukem Exp $
PROG=palette
-NOMAN=yes
+MKMAN=no
.include <bsd.prog.mk>
diff --git a/sys/arch/x68k/usr.bin/rtcalarm/Makefile b/sys/arch/x68k/usr.bin/rtcalarm/Makefile
index d25af88a6d0..5860d7f1486 100644
--- a/sys/arch/x68k/usr.bin/rtcalarm/Makefile
+++ b/sys/arch/x68k/usr.bin/rtcalarm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 1997/06/22 07:09:07 mrg Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:51 lukem Exp $
PROG=rtcalarm
-NOMAN=yes
+MKMAN=no
.include <bsd.prog.mk>
diff --git a/sys/arch/x68k/usr.bin/tvctrl/Makefile b/sys/arch/x68k/usr.bin/tvctrl/Makefile
index 554ffe9bc8a..ec880f99b25 100644
--- a/sys/arch/x68k/usr.bin/tvctrl/Makefile
+++ b/sys/arch/x68k/usr.bin/tvctrl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 1997/06/22 07:09:09 mrg Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:51 lukem Exp $
PROG=tvctrl
-NOMAN=yes
+MKMAN=no
.include <bsd.prog.mk>
diff --git a/sys/arch/x68k/usr.sbin/poffd/Makefile b/sys/arch/x68k/usr.sbin/poffd/Makefile
index 4e2a01682d6..b4c1a15901b 100644
--- a/sys/arch/x68k/usr.sbin/poffd/Makefile
+++ b/sys/arch/x68k/usr.sbin/poffd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 1997/06/22 07:09:11 mrg Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:51 lukem Exp $
PROG= poffd
-NOMAN= yes
+MKMAN= no
#BINOWN= root
#BINGRP= operator
#BINMODE=4550
diff --git a/sys/compat/common/Makefile b/sys/compat/common/Makefile
index 52caf69e32f..c5a8dec9214 100644
--- a/sys/compat/common/Makefile
+++ b/sys/compat/common/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 1998/04/28 16:27:51 kleink Exp $
+# $NetBSD: Makefile,v 1.22 1999/02/13 02:54:51 lukem Exp $
LIB= compat
-NOPIC=
+MKPIC= no
CPPFLAGS= ${COMPATCPPFLAGS}
diff --git a/sys/lib/libkern/Makefile b/sys/lib/libkern/Makefile
index d1e940d7881..20242013576 100644
--- a/sys/lib/libkern/Makefile
+++ b/sys/lib/libkern/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 1998/08/04 05:01:58 perry Exp $
+# $NetBSD: Makefile,v 1.47 1999/02/13 02:54:51 lukem Exp $
LIB= kern
-NOPIC=
+MKPIC= no
M= ${.CURDIR}/arch/${MACHINE_ARCH}
diff --git a/sys/lib/libsa/Makefile b/sys/lib/libsa/Makefile
index 383c9757928..5141c8ecea5 100644
--- a/sys/lib/libsa/Makefile
+++ b/sys/lib/libsa/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 1999/02/12 10:51:28 drochner Exp $
+# $NetBSD: Makefile,v 1.25 1999/02/13 02:54:51 lukem Exp $
LIB= sa
-NOPIC=
-NOPROFILE=
+MKPIC= no
+MKPROFILE=no
SA_USE_CREAD?= no
SA_INCLUDE_NET?= yes
diff --git a/sys/lib/libz/Makefile b/sys/lib/libz/Makefile
index b1b07a5cf64..557b0e64b96 100644
--- a/sys/lib/libz/Makefile
+++ b/sys/lib/libz/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 1997/05/31 21:22:13 cjs Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:51 lukem Exp $
LIB= z
-NOPIC=
-NOPROFILE=
+MKPIC= no
+MKPROFILE=no
CPPFLAGS= -I. ${ZCPPFLAGS} ${ZMISCCPPFLAGS} -D_ZLIB_PRIVATE
diff --git a/sys/lkm/compat/freebsd/Makefile b/sys/lkm/compat/freebsd/Makefile
index 94319ef706c..d79e7ab70cc 100644
--- a/sys/lkm/compat/freebsd/Makefile
+++ b/sys/lkm/compat/freebsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1997/10/26 21:58:33 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:52 lukem Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
CPPFLAGS+= -DVM86
-NOMAN= yep
+MKMAN= no
KMOD= compat_freebsd
diff --git a/sys/lkm/compat/linux/Makefile b/sys/lkm/compat/linux/Makefile
index 4fe9def0e10..b12877afeb1 100644
--- a/sys/lkm/compat/linux/Makefile
+++ b/sys/lkm/compat/linux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1997/10/26 21:58:34 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:52 lukem Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
CPPFLAGS+= -DVM86 -DNVT=1 -DEXEC_ELF32
-NOMAN= yep
+MKMAN= no
KMOD= compat_linux
diff --git a/sys/lkm/compat/sunos/Makefile b/sys/lkm/compat/sunos/Makefile
index f4a86326d66..4ed64ff43fd 100644
--- a/sys/lkm/compat/sunos/Makefile
+++ b/sys/lkm/compat/sunos/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 1997/10/26 21:58:36 lukem Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:52 lukem Exp $
.include "../Makefile.inc"
.PATH: $S/compat/sunos $S/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
CPPFLAGS+= -DCOMPAT_SUNOS
-NOMAN= yep
+MKMAN= no
KMOD= compat_sunos
SRCS= sunos_exec.c sunos_ioctl.c sunos_misc.c sunos_syscalls.c \
sunos_sysent.c sunos_machdep.c lkminit_emul.c
diff --git a/sys/lkm/compat/svr4/Makefile b/sys/lkm/compat/svr4/Makefile
index 330d1a68885..b60e0438c7c 100644
--- a/sys/lkm/compat/svr4/Makefile
+++ b/sys/lkm/compat/svr4/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 1997/10/26 21:58:37 lukem Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:52 lukem Exp $
.include "../Makefile.inc"
.PATH: $S/compat/svr4 $S/arch/${MACHINE}/${MACHINE}
CPPFLAGS+= -DCOMPAT_SVR4
-NOMAN= yep
+MKMAN= no
KMOD= compat_svr4
SRCS= svr4_error.c svr4_exec.c svr4_fcntl.c svr4_filio.c svr4_ioctl.c \
svr4_ipc.c svr4_misc.c svr4_net.c svr4_signal.c svr4_socket.c \
diff --git a/sys/lkm/vfs/adosfs/Makefile b/sys/lkm/vfs/adosfs/Makefile
index c81327ee1d7..8918ff288dc 100644
--- a/sys/lkm/vfs/adosfs/Makefile
+++ b/sys/lkm/vfs/adosfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/02/12 05:41:58 cjs Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:52 lukem Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
MKMAN= no
-KMOD= adosfs
+KMOD= adosfs
SRCS= lkminit_vfs.c
SRCS+= adlookup.c adutil.c advfsops.c advnops.c
diff --git a/sys/lkm/vfs/coda/Makefile b/sys/lkm/vfs/coda/Makefile
index c1ab89a2352..ba471dd2974 100644
--- a/sys/lkm/vfs/coda/Makefile
+++ b/sys/lkm/vfs/coda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/02/12 05:41:58 cjs Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:52 lukem Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
MKMAN= no
-KMOD= coda
+KMOD= coda
SRCS= lkminit_vfs.c
SRCS+= coda_namecache.c coda_psdev.c coda_subr.c coda_venus.c
diff --git a/sys/lkm/vfs/isofs/cd9660/Makefile b/sys/lkm/vfs/isofs/cd9660/Makefile
index b34e84d8bb0..d6c10d6fc53 100644
--- a/sys/lkm/vfs/isofs/cd9660/Makefile
+++ b/sys/lkm/vfs/isofs/cd9660/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/02/12 05:41:58 cjs Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:52 lukem Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
MKMAN= no
-KMOD= cd9660
+KMOD= cd9660
SRCS= lkminit_vfs.c
SRCS+= cd9660_bmap.c cd9660_lookup.c cd9660_rrip.c cd9660_vfsops.c
diff --git a/sys/lkm/vfs/miscfs/fdesc/Makefile b/sys/lkm/vfs/miscfs/fdesc/Makefile
index ac6f8af2fa9..91c0b0ca967 100644
--- a/sys/lkm/vfs/miscfs/fdesc/Makefile
+++ b/sys/lkm/vfs/miscfs/fdesc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/02/12 05:41:58 cjs Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:53 lukem Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
MKMAN= no
-KMOD= fdesc
+KMOD= fdesc
SRCS= lkminit_vfs.c
SRCS+= fdesc_vfsops.c fdesc_vnops.c
diff --git a/sys/lkm/vfs/miscfs/kernfs/Makefile b/sys/lkm/vfs/miscfs/kernfs/Makefile
index 506d1de4b85..6f188efb32c 100644
--- a/sys/lkm/vfs/miscfs/kernfs/Makefile
+++ b/sys/lkm/vfs/miscfs/kernfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/02/12 05:41:58 cjs Exp $
+# $NetBSD: Makefile,v 1.8 1999/02/13 02:54:53 lukem Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
MKMAN= no
-KMOD= kernfs
+KMOD= kernfs
SRCS= lkminit_vfs.c
SRCS+= kernfs_vfsops.c kernfs_vnops.c
diff --git a/sys/lkm/vfs/miscfs/nullfs/Makefile b/sys/lkm/vfs/miscfs/nullfs/Makefile
index b287464554a..ec32fc361ae 100644
--- a/sys/lkm/vfs/miscfs/nullfs/Makefile
+++ b/sys/lkm/vfs/miscfs/nullfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/02/12 05:41:58 cjs Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:53 lukem Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
MKMAN= no
-KMOD= nullfs
+KMOD= nullfs
SRCS= lkminit_vfs.c
SRCS+= null_vfsops.c null_vnops.c null_subr.c
diff --git a/sys/lkm/vfs/miscfs/portal/Makefile b/sys/lkm/vfs/miscfs/portal/Makefile
index 3119cbbabef..0252a457205 100644
--- a/sys/lkm/vfs/miscfs/portal/Makefile
+++ b/sys/lkm/vfs/miscfs/portal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/02/12 05:41:59 cjs Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:53 lukem Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
MKMAN= no
-KMOD= portal
+KMOD= portal
SRCS= lkminit_vfs.c
SRCS+= portal_vfsops.c portal_vnops.c
diff --git a/sys/lkm/vfs/miscfs/procfs/Makefile b/sys/lkm/vfs/miscfs/procfs/Makefile
index a8ce9e367ed..d0af393033c 100644
--- a/sys/lkm/vfs/miscfs/procfs/Makefile
+++ b/sys/lkm/vfs/miscfs/procfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/02/12 05:41:59 cjs Exp $
+# $NetBSD: Makefile,v 1.9 1999/02/13 02:54:53 lukem Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
MKMAN= no
-KMOD= procfs
+KMOD= procfs
SRCS= lkminit_vfs.c
SRCS+= procfs_ctl.c procfs_note.c procfs_status.c procfs_subr.c
diff --git a/sys/lkm/vfs/miscfs/umapfs/Makefile b/sys/lkm/vfs/miscfs/umapfs/Makefile
index c2bcaa9b921..8902b6e0bb3 100644
--- a/sys/lkm/vfs/miscfs/umapfs/Makefile
+++ b/sys/lkm/vfs/miscfs/umapfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/02/12 05:41:59 cjs Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:53 lukem Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
MKMAN= no
-KMOD= umapfs
+KMOD= umapfs
SRCS= lkminit_vfs.c
SRCS+= umap_vfsops.c umap_vnops.c umap_subr.c
diff --git a/sys/lkm/vfs/miscfs/union/Makefile b/sys/lkm/vfs/miscfs/union/Makefile
index 249d1b4bc6d..509268b90d2 100644
--- a/sys/lkm/vfs/miscfs/union/Makefile
+++ b/sys/lkm/vfs/miscfs/union/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/02/12 05:41:59 cjs Exp $
+# $NetBSD: Makefile,v 1.8 1999/02/13 02:54:53 lukem Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
MKMAN= no
-KMOD= union
+KMOD= union
SRCS= lkminit_vfs.c
SRCS+= union_vfsops.c union_vnops.c union_subr.c
diff --git a/sys/lkm/vfs/msdosfs/Makefile b/sys/lkm/vfs/msdosfs/Makefile
index 3a797718997..812b8130288 100644
--- a/sys/lkm/vfs/msdosfs/Makefile
+++ b/sys/lkm/vfs/msdosfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/02/12 05:41:59 cjs Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:53 lukem Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
MKMAN= no
-KMOD= msdosfs
+KMOD= msdosfs
SRCS= lkminit_vfs.c
SRCS+= msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c
diff --git a/sys/lkm/vfs/ufs/ext2fs/Makefile b/sys/lkm/vfs/ufs/ext2fs/Makefile
index 7898d7a48dc..fa94988b8d0 100644
--- a/sys/lkm/vfs/ufs/ext2fs/Makefile
+++ b/sys/lkm/vfs/ufs/ext2fs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/02/12 05:42:00 cjs Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:54 lukem Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
MKMAN= no
-KMOD= ext2fs
+KMOD= ext2fs
SRCS= lkminit_vfs.c
SRCS+= ext2fs_alloc.c ext2fs_balloc.c ext2fs_bmap.c ext2fs_bswap.c
diff --git a/sys/lkm/vfs/ufs/ffs/Makefile b/sys/lkm/vfs/ufs/ffs/Makefile
index b81ba73c1c3..37ebc256ace 100644
--- a/sys/lkm/vfs/ufs/ffs/Makefile
+++ b/sys/lkm/vfs/ufs/ffs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/02/12 05:42:00 cjs Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:54 lukem Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
MKMAN= no
-KMOD= ffs
+KMOD= ffs
SRCS= lkminit_vfs.c
SRCS+= ffs_alloc.c ffs_balloc.c ffs_inode.c ffs_subr.c ffs_tables.c
diff --git a/sys/lkm/vfs/ufs/lfs/Makefile b/sys/lkm/vfs/ufs/lfs/Makefile
index 50e9c1c2788..f3a719dfc31 100644
--- a/sys/lkm/vfs/ufs/lfs/Makefile
+++ b/sys/lkm/vfs/ufs/lfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/02/12 05:42:00 cjs Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:54 lukem Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
MKMAN= no
-KMOD= lfs
+KMOD= lfs
SRCS= lkminit_${KMOD}.c
SRCS+= lfs_vfsops.c lfs_vnops.c lfs_subr.c
diff --git a/sys/lkm/vfs/ufs/mfs/Makefile b/sys/lkm/vfs/ufs/mfs/Makefile
index 234201133fe..d5138b32407 100644
--- a/sys/lkm/vfs/ufs/mfs/Makefile
+++ b/sys/lkm/vfs/ufs/mfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/02/12 05:42:00 cjs Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:54 lukem Exp $
.include "../Makefile.inc"
@@ -6,7 +6,7 @@
MKMAN= no
-KMOD= mfs
+KMOD= mfs
SRCS= lkminit_vfs.c
SRCS+= mfs_vfsops.c mfs_vnops.c
diff --git a/sys/netiso/xebec/Makefile b/sys/netiso/xebec/Makefile
index ccbe33a676b..8176460def6 100644
--- a/sys/netiso/xebec/Makefile
+++ b/sys/netiso/xebec/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 1997/10/26 21:57:16 lukem Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:54 lukem Exp $
# @(#)Makefile 5.16 (Berkeley) 4/26/91
PROG= xebec
SRCS= llparse.c llscan.c main.c malloc.c procs.c putdriver.c sets.c xebec.c
CPPFLAGS+= -DDEBUG -traditional
-NOMAN = noman
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile
index f5c913e4c37..8efb3bdc99a 100644
--- a/usr.bin/calendar/Makefile
+++ b/usr.bin/calendar/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.9 1998/09/27 17:22:10 lukem Exp $
+# $NetBSD: Makefile,v 1.10 1999/02/13 02:54:54 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+.include <bsd.own.mk>
+
PROG= calendar
-.if !defined (NOSHARE)
+.if ${MKSHARE} != "no"
FILESDIR=/usr/share/calendar
FILES!= echo ${.CURDIR}/calendars/calendar.*
.endif
diff --git a/usr.bin/crunch/examples/Makefile b/usr.bin/crunch/examples/Makefile
index bbc9ee6dada..d1926e78b30 100644
--- a/usr.bin/crunch/examples/Makefile
+++ b/usr.bin/crunch/examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1997/08/02 21:30:21 perry Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:55 lukem Exp $
CRUNCHED= fixit
@@ -11,7 +11,7 @@ CONF= $(CRUNCHED).conf
OUTMK= $(CRUNCHED).mk
OUTPUTS= $(OUTMK) $(CRUNCHED).c $(CRUNCHED).cache
-NOMAN=
+MKMAN= no
CLEANFILES+=$(CRUNCHED) $(OUTPUTS) *.o *.lo *_stub.c
all: $(CRUNCHED)
diff --git a/usr.bin/dirname/Makefile b/usr.bin/dirname/Makefile
index 0f3c1e3bc53..cba1a5f2c3d 100644
--- a/usr.bin/dirname/Makefile
+++ b/usr.bin/dirname/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1995/03/28 16:50:08 glass Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:55 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= dirname
-NOMAN= noman
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index 2b3c08e4213..50fd2c13735 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.18 1998/09/27 17:22:11 lukem Exp $
+# $NetBSD: Makefile,v 1.19 1999/02/13 02:54:55 lukem Exp $
+
+.include <bsd.own.mk>
MFILESDIR= /usr/share/misc
MFILES= magic
MAGIC= ${FILESDIR}/${FILES}
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILESDIR= ${MFILESDIR}
FILES= ${MFILES}
.endif
@@ -24,7 +26,7 @@ MAGFILES= $(.CURDIR)/Header \
$(.CURDIR)/magdir/netbsd \
${MAGDIRF}
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
magic: $(MAGFILES)
cat $(MAGFILES) > $(.TARGET)
.else
diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile
index 5a092f0dde0..461b661c5e2 100644
--- a/usr.bin/gencat/Makefile
+++ b/usr.bin/gencat/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 1997/01/09 20:19:42 tls Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:55 lukem Exp $
PROG= gencat
-NOMAN=
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/usr.bin/locate/bigram/Makefile b/usr.bin/locate/bigram/Makefile
index 738a0fe938c..7d27729f54f 100644
--- a/usr.bin/locate/bigram/Makefile
+++ b/usr.bin/locate/bigram/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 1994/12/22 06:17:39 jtc Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:55 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= locate.bigram
-NOMAN= noman
+MKMAN= no
BINDIR= /usr/libexec
.include <bsd.prog.mk>
diff --git a/usr.bin/locate/code/Makefile b/usr.bin/locate/code/Makefile
index b50342f3f6c..0a05f1ee512 100644
--- a/usr.bin/locate/code/Makefile
+++ b/usr.bin/locate/code/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 1997/10/24 09:00:41 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:55 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= locate.code
CPPFLAGS+=-I${.CURDIR}/../locate
-NOMAN= noman
+MKMAN= no
BINDIR= /usr/libexec
.include <bsd.prog.mk>
diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile
index 3cd00b4cec6..4038b685354 100644
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.14 1998/09/27 17:22:12 lukem Exp $
+# $NetBSD: Makefile,v 1.15 1999/02/13 02:54:55 lukem Exp $
# @(#)Makefile 8.3 (Berkeley) 4/20/95
+.include <bsd.own.mk>
+
PROG= mail
SRCS= version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c dotlock.c \
edit.c fio.c getname.c head.c v7.local.c lex.c list.c main.c names.c \
@@ -9,7 +11,7 @@ EFILES= mail.rc
LINKS= ${BINDIR}/mail ${BINDIR}/Mail ${BINDIR}/mail ${BINDIR}/mailx
MLINKS= mail.1 Mail.1 mail.1 mailx.1
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILESDIR=/usr/share/misc
FILES= ${.CURDIR}/misc/mail.help ${.CURDIR}/misc/mail.tildehelp
diff --git a/usr.bin/menuc/Makefile b/usr.bin/menuc/Makefile
index 905ae0ddde2..225ad19d49b 100644
--- a/usr.bin/menuc/Makefile
+++ b/usr.bin/menuc/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.6 1998/09/27 17:22:12 lukem Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:56 lukem Exp $
+
+.include <bsd.own.mk>
PROG= menuc
SRCS= main.c parse.y scan.l avl.c mdb.c util.c
@@ -7,7 +9,7 @@ YHEADER=1
LDADD+= -ll
DPADD+= ${LIBL}
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES= menu_sys.def
FILESDIR= /usr/share/misc
.endif
diff --git a/usr.bin/menuc/testm/Makefile b/usr.bin/menuc/testm/Makefile
index cc4d23b3d71..74adc101b7b 100644
--- a/usr.bin/menuc/testm/Makefile
+++ b/usr.bin/menuc/testm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/07/23 17:56:00 phil Exp $
+# $NetBSD: Makefile,v 1.11 1999/02/13 02:54:56 lukem Exp $
MENUC!=cd $(.CURDIR)/..; \
printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/menuc\n" | ${MAKE} -s -f-
@@ -12,7 +12,7 @@ CPPFLAGS+=-I.
WARNS= 1
LDADD+= -lcurses -ltermcap
DPADD+= ${LIBCURSES}
-NOMAN= noman
+MKMAN= no
CLEANFILES+= menu_defs.c menu_defs.h msg_defs.c msg_defs.h
diff --git a/usr.bin/msgc/Makefile b/usr.bin/msgc/Makefile
index ae362cff903..3a454262a1e 100644
--- a/usr.bin/msgc/Makefile
+++ b/usr.bin/msgc/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.6 1998/09/27 17:22:12 lukem Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:56 lukem Exp $
+
+.include <bsd.own.mk>
PROG= msgc
SRCS= msgmain.c msgparse.y msgscan.l msgdb.c util.c avl.c
@@ -8,7 +10,7 @@ YHEADER=1
LDADD+= -ll
DPADD+= ${LIBL}
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES= msg_sys.def
FILESDIR= /usr/share/misc
.endif
diff --git a/usr.bin/tn3270/tools/Makefile.inc b/usr.bin/tn3270/tools/Makefile.inc
index a900bd61713..a016c11a9ff 100644
--- a/usr.bin/tn3270/tools/Makefile.inc
+++ b/usr.bin/tn3270/tools/Makefile.inc
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.4 1998/09/06 02:54:48 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.5 1999/02/13 02:54:56 lukem Exp $
CPPFLAGS+=-I${.CURDIR}/../../api
-NOMAN= noman
+MKMAN= no
KBD= unix.kbd
.PATH: ${.CURDIR}/../../api
diff --git a/usr.bin/unexpand/Makefile b/usr.bin/unexpand/Makefile
index 6004d43ed41..cc2076c0b4e 100644
--- a/usr.bin/unexpand/Makefile
+++ b/usr.bin/unexpand/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1994/12/07 00:36:39 jtc Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:56 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= unexpand
-NOMAN= noman
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile
index 94cac4f5333..8bd174de073 100644
--- a/usr.bin/units/Makefile
+++ b/usr.bin/units/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.5 1998/09/27 17:22:12 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:56 lukem Exp $
+
+.include <bsd.own.mk>
PROG= units
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES= units.lib
FILESDIR=/usr/share/misc
.endif
diff --git a/usr.bin/usbhidctl/Makefile b/usr.bin/usbhidctl/Makefile
index 05035fc823e..8321ade1b9e 100644
--- a/usr.bin/usbhidctl/Makefile
+++ b/usr.bin/usbhidctl/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.2 1998/09/27 17:22:13 lukem Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:54:56 lukem Exp $
+
+.include <bsd.own.mk>
PROG= usbhidctl
SRCS= usbhid.c hidsubr.c
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES= usb_hid_usages
FILESDIR=/usr/share/misc
.endif
diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile
index 2a65b994d6b..bbd819eef02 100644
--- a/usr.bin/uudecode/Makefile
+++ b/usr.bin/uudecode/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 1994/11/17 07:39:34 jtc Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:57 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= uudecode
-NOMAN= noman
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile
index 7934df42222..73f54e05e9b 100644
--- a/usr.bin/vgrind/Makefile
+++ b/usr.bin/vgrind/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.9 1998/09/27 17:22:13 lukem Exp $
+# $NetBSD: Makefile,v 1.10 1999/02/13 02:54:57 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/9/93
+.include <bsd.own.mk>
+
PROG= vfontedpr
SRCS= regexp.c vfontedpr.c
MAN= vgrind.1 vgrindefs.5
BINDIR= /usr/libexec
CLEANFILES+=vgrindefs.src.db
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES= tmac.vgrind vgrindefs.src vgrindefs.src.db
FILESNAME_vgrindefs.src= vgrindefs
FILESNAME_vgrindefs.src.db= vgrindefs.db
@@ -20,7 +22,7 @@ SCRIPTSDIR=/usr/bin
all: vfontedpr vgrindefs.src.db
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
vgrindefs.src.db: vgrindefs.src
cap_mkdb -f vgrindefs.src ${.CURDIR}/vgrindefs.src
.else
diff --git a/usr.bin/vgrind/RETEST/Makefile b/usr.bin/vgrind/RETEST/Makefile
index fabaa383741..f3a4cc0222d 100644
--- a/usr.bin/vgrind/RETEST/Makefile
+++ b/usr.bin/vgrind/RETEST/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 1997/05/13 23:48:31 gwr Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:57 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= retest
SRCS= regexp.c retest.c
.PATH: ${.CURDIR}/..
-NOMAN= noman
+MKMAN= no
# do not install test programs
proginstall::
diff --git a/usr.bin/vi/build/Makefile b/usr.bin/vi/build/Makefile
index 3821a2b4844..e89f739fa40 100644
--- a/usr.bin/vi/build/Makefile
+++ b/usr.bin/vi/build/Makefile
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.14 1999/01/08 06:16:54 abs Exp $
+# $NetBSD: Makefile,v 1.15 1999/02/13 02:54:57 lukem Exp $
#
# from: @(#)Makefile.in 8.56 (Berkeley) 5/18/96
+.include <bsd.own.mk>
+
WARNS= 0
CPPFLAGS+=-I${.CURDIR} -I${.CURDIR}/../include -DGTAGS
@@ -33,7 +35,7 @@ MLINKS= vi.1 ex.1 vi.1 view.1
.PATH: ${.CURDIR}/../vi ${.CURDIR}/../ex ${.CURDIR}/../cl
.PATH: ${.CURDIR}/../common ${.CURDIR}/../docs/USD.doc/vi.man
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
cat= dutch english german ru_SU.KOI8-R swedish
FILES=${cat:S@^@${.CURDIR}/../catalog/@g}
FILESDIR=/usr/share/vi/catalog
diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile
index 38c85216765..102acb737be 100644
--- a/usr.bin/xlint/lint1/Makefile
+++ b/usr.bin/xlint/lint1/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 1998/04/09 00:32:38 tv Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:57 lukem Exp $
PROG= lint1
SRCS= cgram.y scan.l mem1.c mem.c err.c main1.c decl.c tree.c func.c \
init.c emit.c emit1.c
-NOMAN=
+MKMAN= no
LDADD+= -ll
DPADD+= ${LIBL}
YHEADER=1
diff --git a/usr.bin/xlint/lint2/Makefile b/usr.bin/xlint/lint2/Makefile
index 35639a86f2f..3c5f02de040 100644
--- a/usr.bin/xlint/lint2/Makefile
+++ b/usr.bin/xlint/lint2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 1997/10/24 09:01:15 lukem Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:57 lukem Exp $
.PATH: ${.CURDIR}/../lint1
PROG= lint2
SRCS= main2.c hash.c read.c mem.c mem2.c chk.c msg.c emit.c emit2.c
-NOMAN=
+MKMAN= no
CPPFLAGS+=-I${.CURDIR}/../lint1
LINTFLAGS=-abehrz
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 7aa550c8274..6aa8f4c5c48 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 1999/02/05 19:25:10 perry Exp $
+# $NetBSD: Makefile,v 1.103 1999/02/13 02:54:57 lukem Exp $
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
#
# not yet done: catman
@@ -23,7 +23,7 @@ SUBDIR= ac accton amd apm apmd arp bad144 bootp \
ypbind yppoll ypserv ypset \
zdump zic
-.ifndef NO_SENDMAIL
+.if !defined(NO_SENDMAIL)
SUBDIR+= sendmail
.endif
diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc
index ae8e07be388..0ea4a66996b 100644
--- a/usr.sbin/amd/Makefile.inc
+++ b/usr.sbin/amd/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 1999/02/01 19:05:09 christos Exp $
+# $NetBSD: Makefile.inc,v 1.13 1999/02/13 02:54:58 lukem Exp $
.include <bsd.own.mk>
@@ -9,7 +9,7 @@ CPPFLAGS += -I${.CURDIR}/../include -I${.CURDIR} -I${LIBAMU} -I. -DHAVE_CONFIG_H
CPPFLAGS += -DDEBUG
.if !defined(LIB) || empty(LIB)
LDADD += -L${LIBAMU} -lamu -lrpcsvc -ll
-.if defined(NOPIC)
+.if ${MKPIC} == "no"
DPADD += ${LIBAMU}/libamu.a
.else
DPADD += ${LIBAMU}/libamu_pic.a
diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile
index 504643bbb9b..2a5a47c87c9 100644
--- a/usr.sbin/amd/libamu/Makefile
+++ b/usr.sbin/amd/libamu/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 1998/09/13 23:25:19 tv Exp $
+# $NetBSD: Makefile,v 1.10 1999/02/13 02:54:58 lukem Exp $
LIB= amu
SRCS= mtabutil.c tranputil.c umount_fs.c xutil.c xdr_func.c wire.c \
util.c nfs_prot_xdr.c mtab.c mount_fs.c misc_rpc.c hasmntopt.c config_local.h
-NOLINKLIB=
+MKLINKLIB=no
config_local.h: mkconf
@rm -f ${.TARGET}
diff --git a/usr.sbin/bind/lib/Makefile b/usr.sbin/bind/lib/Makefile
index c8ad5baec52..aaf65f8d09b 100644
--- a/usr.sbin/bind/lib/Makefile
+++ b/usr.sbin/bind/lib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/10/05 18:01:57 tron Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:58 lukem Exp $
LIB=bind
-NOPIC=
-NOPROFILE=
-NOLINT=
+MKPIC=no
+MKPROFILE=no
+MKLINT=no
CPPFLAGS+= ${INCLUDE}
diff --git a/usr.sbin/bind/nsupdate/Makefile b/usr.sbin/bind/nsupdate/Makefile
index 0f87f9ed9b3..222933e92d6 100644
--- a/usr.sbin/bind/nsupdate/Makefile
+++ b/usr.sbin/bind/nsupdate/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 1998/10/05 18:02:00 tron Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:58 lukem Exp $
WARNS= 0
PROG= nsupdate
SRCS= ${PROG}.c
CPPFLAGS+= ${INCLUDE}
LDADD= ${LIBRARY}
-NOMAN=
+MKMAN= no
.include "../../Makefile.inc"
.include <bsd.prog.mk>
diff --git a/usr.sbin/bootp/bootpgw/Makefile b/usr.sbin/bootp/bootpgw/Makefile
index 1204918e403..0c610f370c6 100644
--- a/usr.sbin/bootp/bootpgw/Makefile
+++ b/usr.sbin/bootp/bootpgw/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 1998/03/15 01:13:25 lukem Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:58 lukem Exp $
PROG= bootpgw
-NOMAN=
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/usr.sbin/bootp/common/Makefile b/usr.sbin/bootp/common/Makefile
index 2ae5a8eca5c..08dd6294491 100644
--- a/usr.sbin/bootp/common/Makefile
+++ b/usr.sbin/bootp/common/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1 1998/03/15 01:13:25 lukem Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:58 lukem Exp $
LIB= common
SRCS= dovend.c dumptab.c getif.c hash.c hwaddr.c lookup.c readfile.c \
report.c tzone.c
CPPFLAGS+= -DETC_ETHERS -DSYSLOG -DDEBUG
-NOPROFILE= noprofile
-NOPIC= nopic
+MKPROFILE= no
+MKPIC= no
# only needed during build
libinstall::
diff --git a/usr.sbin/dhcp/common/Makefile b/usr.sbin/dhcp/common/Makefile
index 8d1c99be55d..6759d0911be 100644
--- a/usr.sbin/dhcp/common/Makefile
+++ b/usr.sbin/dhcp/common/Makefile
@@ -35,8 +35,8 @@ SRCS = raw.c parse.c nit.c icmp.c dispatch.c conflex.c upf.c bpf.c socket.c \
packet.c memory.c print.c options.c inet.c convert.c sysconf.c \
tree.c tables.c hash.c alloc.c errwarn.c inet_addr.c dns.c resolv.c
-NOPROFILE=
-NOPIC=
+MKPROFILE=no
+MKPIC=no
# only needed during build
libinstall::
diff --git a/usr.sbin/gspa/gspa/Makefile b/usr.sbin/gspa/gspa/Makefile
index 3feb3bc3d97..93b6ecc285c 100644
--- a/usr.sbin/gspa/gspa/Makefile
+++ b/usr.sbin/gspa/gspa/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 1998/07/10 16:37:56 rvb Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:59 lukem Exp $
PROG= gspa
CPPFLAGS+=-I. -I${.CURDIR}
HDRS= gsp_ass.h gsp_code.h
SRCS= gspa.c gsp_out.c gsp_sym.c gsp_lex.c gsp_act.c gsp_eval.c \
gsp_inst.c gsp_pseu.c gsp_gram.y
-NOMAN= noman
+MKMAN= no
YHEADER=1
gsp_eval.o gsp_lex.o gspa.o: gsp_gram.h
diff --git a/usr.sbin/gspa/gspahextoc/Makefile b/usr.sbin/gspa/gspahextoc/Makefile
index ea94a91abee..82d00e8bce4 100644
--- a/usr.sbin/gspa/gspahextoc/Makefile
+++ b/usr.sbin/gspa/gspahextoc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 1997/10/17 06:59:17 lukem Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/13 02:54:59 lukem Exp $
PROG= gspahextoc
SRCS= gspahextoc.l
-NOMAN= noman
+MKMAN= no
CPPFLAGS+=-DYY_NO_UNPUT
LDADD= -ll
DPADD= ${LIBL}
diff --git a/usr.sbin/hilinfo/Makefile b/usr.sbin/hilinfo/Makefile
index a0b9c942fae..6164457612d 100644
--- a/usr.sbin/hilinfo/Makefile
+++ b/usr.sbin/hilinfo/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 1997/10/25 06:58:04 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:59 lukem Exp $
.if ${MACHINE} == "hp300"
PROG= hilinfo
CPPFLAGS+= -I${.CURDIR}/../../sys/arch/hp300
.else
-NOOBJ=
+MKOBJ= no
.endif
-NOMAN=
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/usr.sbin/ipf/rules/Makefile b/usr.sbin/ipf/rules/Makefile
index 2d9a2ce91ce..b81aa486240 100644
--- a/usr.sbin/ipf/rules/Makefile
+++ b/usr.sbin/ipf/rules/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.4 1998/09/27 17:22:14 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:59 lukem Exp $
-.if !defined(NOSHARE)
+.include <bsd.own.mk>
+
+.if ${MKSHARE} != "no"
FILESDIR= /usr/share/examples/ipf
MAN= mkfilters.1
diff --git a/usr.sbin/lpr/common_source/Makefile b/usr.sbin/lpr/common_source/Makefile
index 9feaeba897a..5f0154212d8 100644
--- a/usr.sbin/lpr/common_source/Makefile
+++ b/usr.sbin/lpr/common_source/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 1997/10/11 20:25:53 mycroft Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/13 02:54:59 lukem Exp $
LIB= common
SRCS= common.c displayq.c rmjob.c startdaemon.c
-NOPROFILE= noprofile
-NOPIC= nopic
+MKPROFILE= no
+MKPIC= no
# only needed during build
libinstall::
diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile
index 6cdc52639fa..fbf3d6dd619 100644
--- a/usr.sbin/lpr/filters/Makefile
+++ b/usr.sbin/lpr/filters/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 1995/11/15 22:51:29 pk Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:59 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= lpf
-NOMAN= noman
+MKMAN= no
BINDIR= /usr/libexec/lpr
.include <bsd.prog.mk>
diff --git a/usr.sbin/mopd/common/Makefile b/usr.sbin/mopd/common/Makefile
index 113c52123b3..84cf920d159 100644
--- a/usr.sbin/mopd/common/Makefile
+++ b/usr.sbin/mopd/common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1997/10/16 07:36:27 lukem Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:55:00 lukem Exp $
LIB= common
SRCS= cmp.c device.c dl.c file.c get.c loop-bsd.c mopdef.c nma.c pf.c \
@@ -9,8 +9,8 @@ version.c: VERSION
rm -f version.c; \
sed 's/.*/char version[] = "&";/' ${.ALLSRC} > version.c
-NOPROFILE= noprofile
-NOPIC= nopic
+MKPROFILE= no
+MKPIC= no
# only needed during build
libinstall::
diff --git a/usr.sbin/named/nslookup/Makefile b/usr.sbin/named/nslookup/Makefile
index 4e508897d1f..a0a523940c5 100644
--- a/usr.sbin/named/nslookup/Makefile
+++ b/usr.sbin/named/nslookup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1998/09/27 17:22:14 lukem Exp $
+# $NetBSD: Makefile,v 1.9 1999/02/13 02:55:00 lukem Exp $
# from: $Id: Makefile,v 8.1 1994/12/15 06:23:48 vixie Exp
.PATH: ${.CURDIR}/../nslookup \
@@ -11,7 +11,7 @@ DPADD= ${LIBL}
LDADD= -ll
CLEANFILES+= commands.c lex.yy.c lex.yy.o
MAN= nslookup.8
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES= nslookup.help
FILESDIR=/usr/share/misc
.endif
diff --git a/usr.sbin/pkg_install/lib/Makefile b/usr.sbin/pkg_install/lib/Makefile
index 1c791d6b636..6d05c95a420 100644
--- a/usr.sbin/pkg_install/lib/Makefile
+++ b/usr.sbin/pkg_install/lib/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.8 1999/01/19 17:02:01 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 1999/02/13 02:55:00 lukem Exp $
# Original from FreeBSD, no rcs id.
LIB= install
SRCS= exec.c file.c global.c pen.c pkgdb.c plist.c str.c
# Don't need to install ftpio.3
-NOMAN= yes
-NOPROFILE= yes
-NOPIC= yes
+MKMAN= no
+MKPROFILE= no
+MKPIC= no
# only needed during build - prevent installation of library
libinstall::
diff --git a/usr.sbin/rpc.pcnfsd/Makefile.clnt b/usr.sbin/rpc.pcnfsd/Makefile.clnt
index d0c5a804377..9d9cd9560dc 100644
--- a/usr.sbin/rpc.pcnfsd/Makefile.clnt
+++ b/usr.sbin/rpc.pcnfsd/Makefile.clnt
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.clnt,v 1.4 1997/10/25 06:58:39 lukem Exp $
+# $NetBSD: Makefile.clnt,v 1.5 1999/02/13 02:55:00 lukem Exp $
# This Makefile builds a client used for testing.
@@ -6,7 +6,7 @@ CPPFLAGS += -DUSER_CACHE -DWTMP -DUSE_YP -I${.OBJDIR}
PROG= clnt.pcnfsd
SRCS= pcnfsd_test.c pcnfsd_clnt.c pcnfsd_xdr.c
-NOMAN= noman
+MKMAN= no
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index d3c2820a6b2..4d94ddde634 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.14 1998/09/29 07:03:37 lukem Exp $
+# $NetBSD: Makefile,v 1.15 1999/02/13 02:55:00 lukem Exp $
#
# @(#)Makefile 8.15 (Berkeley) 9/21/96
+.include <bsd.own.mk>
+
SUBDIR= src mailstats makemap praliases smrsh
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
SUBDIR+= cf/cf
.if make(install)
SUBDIR+= doc/intro doc/op cf
diff --git a/usr.sbin/sendmail/cf/Makefile b/usr.sbin/sendmail/cf/Makefile
index 48c5cb1597b..f9328ed65ad 100644
--- a/usr.sbin/sendmail/cf/Makefile
+++ b/usr.sbin/sendmail/cf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 1998/09/27 17:22:14 lukem Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:55:00 lukem Exp $
# install these sources in /usr/share/sendmail
#
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILESDIR=/usr/share/sendmail
FILES=README
diff --git a/usr.sbin/sendmail/src/Makefile b/usr.sbin/sendmail/src/Makefile
index 97dbcd02021..3e623caddab 100644
--- a/usr.sbin/sendmail/src/Makefile
+++ b/usr.sbin/sendmail/src/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 1999/02/05 19:22:50 perry Exp $
+# $NetBSD: Makefile,v 1.37 1999/02/13 02:55:00 lukem Exp $
#
# NetBSD Makefile
#
@@ -12,6 +12,8 @@
# the "makesendmail" script. #
#########################################################################
+.include <bsd.own.mk>
+
PROG= sendmail
# define the database format to use for aliases et al. Can be -DNEWDB (for
@@ -41,7 +43,7 @@ BINDIR= /usr/libexec/sendmail
BINOWN= root
BINGRP= kmem
BINMODE=6555
-.if !defined(NOSHARE)
+.if ${MKSHARE} != "no"
FILES=sendmail.hf
FILESDIR=/usr/share/misc
.endif
diff --git a/usr.sbin/sup/lib/Makefile b/usr.sbin/sup/lib/Makefile
index dabb8174607..248f05ea65e 100644
--- a/usr.sbin/sup/lib/Makefile
+++ b/usr.sbin/sup/lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1997/10/16 08:26:50 mikel Exp $
+# $NetBSD: Makefile,v 1.3 1999/02/13 02:55:01 lukem Exp $
LIB= sup
@@ -11,8 +11,8 @@ SRCS+= atoo.c errmsg.c expand.c ffilecopy.c filecopy.c \
CLEANFILES+=netcrypt.c
-NOPROFILE=
-NOPIC=
+MKPROFILE=no
+MKPIC= no
netcrypt.c: netcryptvoid.c
rm -f netcrypt.c
diff --git a/usr.sbin/sup/supscan/Makefile b/usr.sbin/sup/supscan/Makefile
index b2eec2c4844..804c5326fdd 100644
--- a/usr.sbin/sup/supscan/Makefile
+++ b/usr.sbin/sup/supscan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 1997/10/07 01:31:24 thorpej Exp $
+# $NetBSD: Makefile,v 1.2 1999/02/13 02:55:01 lukem Exp $
PROG= supscan
SRCS= supscan.c scan.c
-NOMAN=
+MKMAN= no
.PATH: ${.CURDIR}/../source
diff --git a/usr.sbin/videomode/Makefile b/usr.sbin/videomode/Makefile
index c280533556f..5a2cc62ad96 100644
--- a/usr.sbin/videomode/Makefile
+++ b/usr.sbin/videomode/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 1997/10/25 06:58:53 lukem Exp $
+# $NetBSD: Makefile,v 1.5 1999/02/13 02:55:01 lukem Exp $
.if ${MACHINE} == "amiga"
PROG=videomode
CPPFLAGS+=-I${.CURDIR}/../../sys/arch -D${MACHINE}
.else
-NOOBJ= noobj
+MKOBJ= no
.endif
-NOMAN= noman
+MKMAN= no
.include <bsd.prog.mk>
diff --git a/usr.sbin/ypserv/common/Makefile b/usr.sbin/ypserv/common/Makefile
index 77f62358a7d..8220bd3e09d 100644
--- a/usr.sbin/ypserv/common/Makefile
+++ b/usr.sbin/ypserv/common/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 1999/01/22 02:37:00 thorpej Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/13 02:55:01 lukem Exp $
LIB= common
SRCS= localhostname.c ypdb.c yplib_host.c ypresp_xdr.c
-NOPROFILE= noprofile
-NOPIC= nopic
+MKPROFILE= no
+MKPIC= no
# only needed during build
libinstall::