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