summaryrefslogtreecommitdiff
path: root/usr.bin
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 /usr.bin
parent22a5cb007fa30a3bcb21050c2808f836b62821c7 (diff)
convert from NOxxx= to MKxxx=no.
include <bsd.own.mk> if testing a MKxxx variable.
Diffstat (limited to 'usr.bin')
-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
21 files changed, 62 insertions, 44 deletions
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