diff options
212 files changed, 246 insertions, 229 deletions
@@ -232,7 +232,7 @@ MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ INSTALL="sh ${.CURDIR}/tools/install.sh" MMAKE= ${MMAKEENV} make \ -D_UPGRADING \ - -DNOMAN -DNOSHARED \ + -DNOMAN -DNO_MAN -DNOSHARED \ -DNO_CPU_CFLAGS -DNO_WERROR make: .PHONY diff --git a/Makefile.inc1 b/Makefile.inc1 index 6314448..5682ea8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -8,7 +8,7 @@ # -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNOCLEAN do not clean at all # -DNOCRYPT will prevent building of crypt versions -# -DNOMAN do not build the manual pages +# -DNO_MAN do not build the manual pages # -DNOPROFILE do not build profiled libraries # -DNOGAMES do not go into games subdir # -DNOSHARE do not go into share subdir @@ -182,7 +182,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ - -DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPIC -DNOPROFILE \ + -DNOHTML -DNOINFO -DNOLINT -DNO_MAN -DNOPIC -DNOPROFILE \ -DNOSHARED -DNO_CPU_CFLAGS -DNO_WARNS # build-tools stage @@ -231,7 +231,7 @@ LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ SHLIBDIR=/usr/lib32 LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \ - -DNO_BIND -DNOMAN -DNODOC -DNOINFO -DNOHTML \ + -DNO_BIND -DNO_MAN -DNODOC -DNOINFO -DNOHTML \ CC="cc ${LIB32CC}" \ CXX="c++ ${LIB32CXX}" \ OBJC="cc ${LIB32OBJC}" \ @@ -364,7 +364,7 @@ _libraries: @echo ">>> stage 4.2: building libraries" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; \ - ${WMAKE} -DNOFSCHG -DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPROFILE \ + ${WMAKE} -DNOFSCHG -DNOHTML -DNOINFO -DNOLINT -DNO_MAN -DNOPROFILE \ libraries _depend: @echo diff --git a/etc/Makefile b/etc/Makefile index 0900b53..04c4233 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -65,7 +65,7 @@ ETCMAIL=Makefile README mailer.conf access.sample virtusertable.sample \ FREEBSD=COPYRIGHT afterinstall: -.if !defined(NOMAN) +.if !defined(NO_MAN) cd ${.CURDIR}/../share/man; ${MAKE} makedb .endif diff --git a/etc/defaults/Makefile b/etc/defaults/Makefile index 701867f..3c613fb 100644 --- a/etc/defaults/Makefile +++ b/etc/defaults/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ FILES= devfs.rules pccard.conf periodic.conf rc.conf -NOOBJ= +NO_OBJ= FILESDIR= /etc/defaults FILESMODE= 444 diff --git a/etc/isdn/Makefile b/etc/isdn/Makefile index e3cfddf..d40ef47 100644 --- a/etc/isdn/Makefile +++ b/etc/isdn/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= +NO_OBJ= SCRIPTS= answer \ isdntel.sh \ diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile index 97a1bc6..10816e4 100644 --- a/etc/mtree/Makefile +++ b/etc/mtree/Makefile @@ -17,7 +17,7 @@ _BIND.include.dist= BIND.include.dist .endif .endif -NOOBJ= +NO_OBJ= FILESDIR= /etc/mtree .include <bsd.prog.mk> diff --git a/etc/namedb/Makefile b/etc/namedb/Makefile index 22fb64d..1d240f6 100644 --- a/etc/namedb/Makefile +++ b/etc/namedb/Makefile @@ -2,7 +2,7 @@ FILES= PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \ make-localhost -NOOBJ= +NO_OBJ= FILESDIR= /etc/namedb FILESMODE= 644 diff --git a/etc/pam.d/Makefile b/etc/pam.d/Makefile index 1fd307e..4a69de4 100644 --- a/etc/pam.d/Makefile +++ b/etc/pam.d/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= +NO_OBJ= FILES= README ftpd gdm imap kde login other passwd pop3 \ rexecd rsh sshd su system telnetd xdm FILESDIR= /etc/pam.d diff --git a/etc/periodic/Makefile.inc b/etc/periodic/Makefile.inc index 07b4348..a05341c 100644 --- a/etc/periodic/Makefile.inc +++ b/etc/periodic/Makefile.inc @@ -1,5 +1,5 @@ # $FreeBSD$ BINDIR= /etc/periodic/${.CURDIR:T} -NOOBJ= +NO_OBJ= FILESMODE= 755 diff --git a/games/fortune/unstr/Makefile b/games/fortune/unstr/Makefile index b7fa7cf..5342a92 100644 --- a/games/fortune/unstr/Makefile +++ b/games/fortune/unstr/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= unstr -NOMAN= +NO_MAN= CFLAGS+=-Wall -I${.CURDIR}/../strfile .include <bsd.prog.mk> diff --git a/games/ppt/Makefile b/games/ppt/Makefile index 958759d..d4433c4 100644 --- a/games/ppt/Makefile +++ b/games/ppt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= ppt -NOMAN= +NO_MAN= WARNS?= 6 diff --git a/games/primes/Makefile b/games/primes/Makefile index 67b32aa..5e111e7 100644 --- a/games/primes/Makefile +++ b/games/primes/Makefile @@ -3,7 +3,7 @@ PROG= primes SRCS= pattern.c pr_tbl.c primes.c -NOMAN= +NO_MAN= DPADD= ${LIBM} LDADD= -lm diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile index 72bc0f7..4d10ae0 100644 --- a/gnu/lib/libobjc/Makefile +++ b/gnu/lib/libobjc/Makefile @@ -6,7 +6,7 @@ GCCDIR= ${.CURDIR}/../../../contrib/gcc .PATH: ${OBJCDIR}/objc ${OBJCDIR} LIB= objc -NOMAN= +NO_MAN= .if ${MACHINE_ARCH} == "amd64" SHLIB_MAJOR= 1 .else diff --git a/gnu/usr.bin/binutils/gdbreplay/Makefile b/gnu/usr.bin/binutils/gdbreplay/Makefile index 6811831..107051a 100644 --- a/gnu/usr.bin/binutils/gdbreplay/Makefile +++ b/gnu/usr.bin/binutils/gdbreplay/Makefile @@ -10,7 +10,7 @@ GDBDIR= ${.CURDIR}/../../../../contrib/gdb .PATH: ${GDBDIR}/gdb PROG= gdbreplay -NOMAN= +NO_MAN= SRCS= gdbreplay.c diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile index 05ee4ec..bf7aad0 100644 --- a/gnu/usr.bin/cc/c++/Makefile +++ b/gnu/usr.bin/cc/c++/Makefile @@ -9,7 +9,7 @@ PROG= c++ SRCS= gcc.c g++spec.c LINKS= ${BINDIR}/c++ ${BINDIR}/g++ LINKS+= ${BINDIR}/c++ ${BINDIR}/CC -NOMAN= +NO_MAN= DPADD= ${LIBCC_INT} LDADD= ${LIBCC_INT} diff --git a/gnu/usr.bin/cc/c++filt/Makefile b/gnu/usr.bin/cc/c++filt/Makefile index 6121146..f912c78 100644 --- a/gnu/usr.bin/cc/c++filt/Makefile +++ b/gnu/usr.bin/cc/c++filt/Makefile @@ -6,7 +6,7 @@ PROG= c++filt SRCS= cp-demangle.c -NOMAN= +NO_MAN= CFLAGS+= -DSTANDALONE_DEMANGLER -DIN_GCC -DVERSION=\"$(version)\" diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile index 48c492a..da4ad47 100644 --- a/gnu/usr.bin/cc/cc1/Makefile +++ b/gnu/usr.bin/cc/cc1/Makefile @@ -7,7 +7,7 @@ PROG= cc1 SRCS= main.c c-parse+%DIKED.c c-lang.c stub-objc.c BINDIR= /usr/libexec -NOMAN= +NO_MAN= NOSHARED?=yes CFLAGS+= -I. diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile index 5df82f5..94d7a61 100644 --- a/gnu/usr.bin/cc/cc1obj/Makefile +++ b/gnu/usr.bin/cc/cc1obj/Makefile @@ -7,7 +7,7 @@ PROG= cc1obj SRCS= main.c objc-parse+DIKED.c objc-act.c objc-lang.c c-decl.c BINDIR= /usr/libexec -NOMAN= +NO_MAN= NOSHARED?=yes CFLAGS+= -I${GCCDIR}/objc -I. diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile index 9ca7fae..8bc910e 100644 --- a/gnu/usr.bin/cc/cc1plus/Makefile +++ b/gnu/usr.bin/cc/cc1plus/Makefile @@ -12,7 +12,7 @@ SRCS+= main.c cp-lang.c c-opts.c call.c class.c cvt.c cxx-pretty-print.c \ search.c semantics.c tree.c typeck.c typeck2.c optimize.c BINDIR= /usr/libexec -NOMAN= +NO_MAN= NOSHARED?=yes CFLAGS+= -I${GCCDIR}/cp -I. diff --git a/gnu/usr.bin/cc/collect2/Makefile b/gnu/usr.bin/cc/collect2/Makefile index 7ddcee5..5aa9e35 100644 --- a/gnu/usr.bin/cc/collect2/Makefile +++ b/gnu/usr.bin/cc/collect2/Makefile @@ -6,6 +6,6 @@ PROG= collect2 SRCS= collect2.c tlink.c version.c -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/gnu/usr.bin/cc/f771/Makefile b/gnu/usr.bin/cc/f771/Makefile index 5f2d86f..8d09092 100644 --- a/gnu/usr.bin/cc/f771/Makefile +++ b/gnu/usr.bin/cc/f771/Makefile @@ -10,7 +10,7 @@ SRCS= bad.c bit.c bld.c com.c data.c equiv.c expr.c global.c implic.c info.c \ stb.c stc.c std.c ste.c storag.c stp.c str.c sts.c stt.c stu.c stv.c \ stw.c symbol.c target.c top.c type.c where.c main.c BINDIR= /usr/libexec -NOMAN= +NO_MAN= CFLAGS+= -I${GCCDIR}/f -I. diff --git a/gnu/usr.bin/cc/include/Makefile b/gnu/usr.bin/cc/include/Makefile index b0b4b30..6318617 100644 --- a/gnu/usr.bin/cc/include/Makefile +++ b/gnu/usr.bin/cc/include/Makefile @@ -14,7 +14,7 @@ INCS= mmintrin.h INCS= ppc-asm.h altivec.h spe.h .endif -NOOBJ= +NO_OBJ= .include <bsd.init.mk> .include <bsd.incs.mk> diff --git a/gnu/usr.bin/cc/protoize/Makefile b/gnu/usr.bin/cc/protoize/Makefile index 500dd03..acd9700 100644 --- a/gnu/usr.bin/cc/protoize/Makefile +++ b/gnu/usr.bin/cc/protoize/Makefile @@ -5,7 +5,7 @@ .PATH: ${.CURDIR}/../cc_tools ${GCCDIR} PROG= protoize -NOMAN= +NO_MAN= # things are rather hard-coded, we work around that here CFLAGS+= -DDEFAULT_TARGET_VERSION=\"\" diff --git a/gnu/usr.bin/dialog/TESTS/Makefile b/gnu/usr.bin/dialog/TESTS/Makefile index f07d07c..39eb15e 100644 --- a/gnu/usr.bin/dialog/TESTS/Makefile +++ b/gnu/usr.bin/dialog/TESTS/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= +NO_OBJ= FILES= README checklist ftreebox infobox inputbox menubox msgbox \ prgbox radiolist textbox treebox yesno FILESDIR= ${SHAREDIR}/examples/dialog diff --git a/gnu/usr.bin/gdb/Makefile.inc b/gnu/usr.bin/gdb/Makefile.inc index 32a8622..abb5296 100644 --- a/gnu/usr.bin/gdb/Makefile.inc +++ b/gnu/usr.bin/gdb/Makefile.inc @@ -43,7 +43,7 @@ GENSRCS+= nm.h tm.h .if defined(GDB_CROSS_DEBUGGER) CFLAGS+= -DCROSS_DEBUGGER GDB_SUFFIX= -${TARGET_ARCH} -NOMAN= +NO_MAN= .endif .include "${TARGET_SUBDIR}/Makefile" diff --git a/gnu/usr.bin/gdb/gdbtui/Makefile b/gnu/usr.bin/gdb/gdbtui/Makefile index 898a267..02efc67 100644 --- a/gnu/usr.bin/gdb/gdbtui/Makefile +++ b/gnu/usr.bin/gdb/gdbtui/Makefile @@ -2,7 +2,7 @@ PROG= gdbtui${GDB_SUFFIX} SRCS= tui-main.c -NOMAN= +NO_MAN= BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ${OBJ_BU}/libiberty/libiberty.a diff --git a/gnu/usr.bin/groff/font/devX100-12/Makefile b/gnu/usr.bin/groff/font/devX100-12/Makefile index 9a136b8..1d77faa 100644 --- a/gnu/usr.bin/groff/font/devX100-12/Makefile +++ b/gnu/usr.bin/groff/font/devX100-12/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= +NO_OBJ= .include "../Makefile.inc" .include "${DIST_DIR}/Makefile.sub" diff --git a/gnu/usr.bin/groff/font/devX100/Makefile b/gnu/usr.bin/groff/font/devX100/Makefile index 9a136b8..1d77faa 100644 --- a/gnu/usr.bin/groff/font/devX100/Makefile +++ b/gnu/usr.bin/groff/font/devX100/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= +NO_OBJ= .include "../Makefile.inc" .include "${DIST_DIR}/Makefile.sub" diff --git a/gnu/usr.bin/groff/font/devX75-12/Makefile b/gnu/usr.bin/groff/font/devX75-12/Makefile index 9a136b8..1d77faa 100644 --- a/gnu/usr.bin/groff/font/devX75-12/Makefile +++ b/gnu/usr.bin/groff/font/devX75-12/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= +NO_OBJ= .include "../Makefile.inc" .include "${DIST_DIR}/Makefile.sub" diff --git a/gnu/usr.bin/groff/font/devX75/Makefile b/gnu/usr.bin/groff/font/devX75/Makefile index 9a136b8..1d77faa 100644 --- a/gnu/usr.bin/groff/font/devX75/Makefile +++ b/gnu/usr.bin/groff/font/devX75/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= +NO_OBJ= .include "../Makefile.inc" .include "${DIST_DIR}/Makefile.sub" diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile index 36d7056..0a1a086 100644 --- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile +++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile @@ -4,6 +4,6 @@ PROG_CXX= post-grohtml SRCS= post-html.cpp html-table.cpp html-text.cpp output.cpp DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/preproc/html/Makefile b/gnu/usr.bin/groff/src/preproc/html/Makefile index 759d76f..2a3fb49 100644 --- a/gnu/usr.bin/groff/src/preproc/html/Makefile +++ b/gnu/usr.bin/groff/src/preproc/html/Makefile @@ -4,6 +4,6 @@ PROG_CXX= pre-grohtml SRCS= pre-html.cpp pushback.cpp DPADD= ${LIBGROFF} LDADD= ${LIBGROFF} -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/gnu/usr.bin/texinfo/infokey/Makefile b/gnu/usr.bin/texinfo/infokey/Makefile index 12c0404..60d0c65a 100644 --- a/gnu/usr.bin/texinfo/infokey/Makefile +++ b/gnu/usr.bin/texinfo/infokey/Makefile @@ -2,7 +2,7 @@ PROG= infokey SRCS= infokey.c key.c -NOMAN= +NO_MAN= DPADD= ${LIBTXI} LDADD= ${LIBTXI} diff --git a/include/arpa/Makefile b/include/arpa/Makefile index 6ad9e47..a480b31 100644 --- a/include/arpa/Makefile +++ b/include/arpa/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= +NO_OBJ= INCS= ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h INCSDIR=${INCLUDEDIR}/arpa diff --git a/include/protocols/Makefile b/include/protocols/Makefile index 4ee43a1..ddd8f21 100644 --- a/include/protocols/Makefile +++ b/include/protocols/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= +NO_OBJ= INCS= dumprestore.h routed.h rwhod.h talkd.h timed.h INCSDIR=${INCLUDEDIR}/protocols diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile index 73fcb8b..6cfa99d 100644 --- a/kerberos5/libexec/ipropd-master/Makefile +++ b/kerberos5/libexec/ipropd-master/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= ipropd-master -NOMAN= +NO_MAN= SRCS= ipropd_master.c kadm5_err.h CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ -I. ${LDAPCFLAGS} diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile index e2dd686..11e2bc3 100644 --- a/kerberos5/libexec/ipropd-slave/Makefile +++ b/kerberos5/libexec/ipropd-slave/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= ipropd-slave -NOMAN= +NO_MAN= SRCS= ipropd_slave.c kadm5_err.h CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ -I. ${LDAPCFLAGS} diff --git a/kerberos5/tools/asn1_compile/Makefile b/kerberos5/tools/asn1_compile/Makefile index c468252..d59adbc 100644 --- a/kerberos5/tools/asn1_compile/Makefile +++ b/kerberos5/tools/asn1_compile/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= asn1_compile -NOMAN= +NO_MAN= SRCS= gen.c \ gen_copy.c \ diff --git a/kerberos5/tools/make-print-version/Makefile b/kerberos5/tools/make-print-version/Makefile index 144c4dc..08899dc 100644 --- a/kerberos5/tools/make-print-version/Makefile +++ b/kerberos5/tools/make-print-version/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= make-print-version -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/kerberos5/tools/make-roken/Makefile b/kerberos5/tools/make-roken/Makefile index 473b83e..6f75cc6 100644 --- a/kerberos5/tools/make-roken/Makefile +++ b/kerberos5/tools/make-roken/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= make-roken -NOMAN= +NO_MAN= CLEANFILES= make-roken.c diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile index cccf559..cca520e 100644 --- a/kerberos5/usr.bin/ksu/Makefile +++ b/kerberos5/usr.bin/ksu/Makefile @@ -5,7 +5,7 @@ PROG= ksu BINMODE=4555 PRECIOUSPROG= .endif -NOMAN= +NO_MAN= SRCS= su.c CFLAGS+=-I${KRB5DIR}/lib/roken DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ diff --git a/lib/libio/Makefile b/lib/libio/Makefile index 73431ee..8456e33 100644 --- a/lib/libio/Makefile +++ b/lib/libio/Makefile @@ -6,6 +6,6 @@ SRCS= io.c swiz.c bwx.c alpha_sethae.c CFLAGS+= -Wall -Wa,-mev56 -NOMAN= +NO_MAN= .include <bsd.lib.mk> diff --git a/lib/libncp/Makefile b/lib/libncp/Makefile index 1896dbe..d93b916 100644 --- a/lib/libncp/Makefile +++ b/lib/libncp/Makefile @@ -6,7 +6,7 @@ LIB= ncp SHLIB_MAJOR= 1 -NOMAN= +NO_MAN= SRCS= ncpl_subr.c ncpl_bind.c ncpl_queue.c ncpl_file.c ncpl_misc.c \ ncpl_net.c ncpl_rcfile.c ncpl_conn.c ncpl_nls.c ncpl_msg.c \ diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile index 49a918b..c4280ec 100644 --- a/lib/librpcsvc/Makefile +++ b/lib/librpcsvc/Makefile @@ -27,7 +27,7 @@ SRCS+= ${GENSRCS} ${OTHERSRCS} ${SECRPCSRCS} CLEANFILES+= ${GENSRCS} -NOMAN= +NO_MAN= .include <bsd.lib.mk> diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile index 7a4e2ea..4699c47 100644 --- a/lib/libsmb/Makefile +++ b/lib/libsmb/Makefile @@ -5,7 +5,7 @@ CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs LIB= smb SHLIB_MAJOR= 1 -NOMAN= +NO_MAN= SRCS= rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \ print.c \ diff --git a/libexec/bootpd/bootpgw/Makefile b/libexec/bootpd/bootpgw/Makefile index e028874..93a982c 100644 --- a/libexec/bootpd/bootpgw/Makefile +++ b/libexec/bootpd/bootpgw/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= bootpgw -NOMAN= +NO_MAN= SRCS= bootpgw.c getif.c hwaddr.c report.c rtmsg.c SRCDIR= ${.CURDIR}/.. diff --git a/libexec/pt_chown/Makefile b/libexec/pt_chown/Makefile index 1295040..d60118b 100644 --- a/libexec/pt_chown/Makefile +++ b/libexec/pt_chown/Makefile @@ -4,6 +4,6 @@ PROG= pt_chown SRCS= pt_chown.c BINOWN= root BINMODE=4555 -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/libexec/save-entropy/Makefile b/libexec/save-entropy/Makefile index 40ed88a..3e27c48 100644 --- a/libexec/save-entropy/Makefile +++ b/libexec/save-entropy/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ SCRIPTS= save-entropy.sh -NOOBJ= +NO_OBJ= .include <bsd.prog.mk> diff --git a/release/Makefile b/release/Makefile index 7fe3eef..57987da 100644 --- a/release/Makefile +++ b/release/Makefile @@ -359,7 +359,7 @@ release rerelease: .endif mkdir -p ${CHROOTDIR} @echo ">>> make release for ${TARGET} started on `LC_ALL=C TZ=GMT date`" - cd ${WORLDDIR} && ${NATIVEMAKE} -DNOGAMES -DNOHTML -DNOINFO -DNOMAN \ + cd ${WORLDDIR} && ${NATIVEMAKE} -DNOGAMES -DNOHTML -DNOINFO -DNO_MAN \ -DNOPROFILE installworld DESTDIR=${CHROOTDIR} cd ${WORLDDIR}/etc && ${NATIVEMAKE} distribution DESTDIR=${CHROOTDIR} if [ -f /etc/resolv.conf ]; then \ diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd index c7d0bd2..5cd5026 100755 --- a/release/picobsd/build/picobsd +++ b/release/picobsd/build/picobsd @@ -182,7 +182,7 @@ create_includes_and_libraries() { BINOWN=`id -un` BINGRP=`id -gn` \ DESTDIR=${l_usrtree}/.. \ make -m ${SRC}/share/mk \ - -DNOHTML -DNOINFO -DNOMAN -DNOSHARE -DNOFSCHG " + -DNOHTML -DNOINFO -DNO_MAN -DNOSHARE -DNOFSCHG " log "do a 'make obj' in a few places." # This is very version-specific... The following works for 5.0 for i in lib secure/lib gnu/lib usr.sbin/pcvt/keycap \ diff --git a/release/picobsd/tinyware/aps/Makefile b/release/picobsd/tinyware/aps/Makefile index a88d92d..f2b481a 100644 --- a/release/picobsd/tinyware/aps/Makefile +++ b/release/picobsd/tinyware/aps/Makefile @@ -2,7 +2,7 @@ # PROG=ps SRCS+=main.c -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/help/Makefile b/release/picobsd/tinyware/help/Makefile index d9b00dd..f7a90e8 100644 --- a/release/picobsd/tinyware/help/Makefile +++ b/release/picobsd/tinyware/help/Makefile @@ -2,7 +2,7 @@ # PROG=help SRCS+=help.c -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/msg/Makefile b/release/picobsd/tinyware/msg/Makefile index a0ecde0..db07e78 100644 --- a/release/picobsd/tinyware/msg/Makefile +++ b/release/picobsd/tinyware/msg/Makefile @@ -2,7 +2,7 @@ # PROG=msg SRCS= msg.c -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/ns/Makefile b/release/picobsd/tinyware/ns/Makefile index 3dd7537..46f5e24 100644 --- a/release/picobsd/tinyware/ns/Makefile +++ b/release/picobsd/tinyware/ns/Makefile @@ -4,6 +4,6 @@ PROG= ns SRCS= ns.c CFLAGS+= -DBRIDGING -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/oinit/Makefile b/release/picobsd/tinyware/oinit/Makefile index 269e0e0..c5fc1f3 100644 --- a/release/picobsd/tinyware/oinit/Makefile +++ b/release/picobsd/tinyware/oinit/Makefile @@ -15,7 +15,7 @@ CFLAGS= -DSH_PATH=\"${SH_PATH}\" -DSH_NAME=\"${SH_NAME}\" \ #LDADD= -lutil -ledit -ltermcap LDADD=-lutil -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/simple_httpd/Makefile b/release/picobsd/tinyware/simple_httpd/Makefile index 0f4b442..cb4b149 100644 --- a/release/picobsd/tinyware/simple_httpd/Makefile +++ b/release/picobsd/tinyware/simple_httpd/Makefile @@ -2,6 +2,6 @@ # PROG=simple_httpd SRCS= simple_httpd.c -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/sps/Makefile b/release/picobsd/tinyware/sps/Makefile index f7ca89a..348ea32 100644 --- a/release/picobsd/tinyware/sps/Makefile +++ b/release/picobsd/tinyware/sps/Makefile @@ -2,7 +2,7 @@ # PROG=sps SRCS= sps.c -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/view/Makefile b/release/picobsd/tinyware/view/Makefile index bd07e7c..e49baa1 100644 --- a/release/picobsd/tinyware/view/Makefile +++ b/release/picobsd/tinyware/view/Makefile @@ -4,6 +4,6 @@ PROG=view SRCS=view.c CFLAGS+=-I/usr/local/include LDADD+=-L/usr/local/lib -lpng -lvgl -lz -lm -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/vm/Makefile b/release/picobsd/tinyware/vm/Makefile index f865abe..b1d6629 100644 --- a/release/picobsd/tinyware/vm/Makefile +++ b/release/picobsd/tinyware/vm/Makefile @@ -3,7 +3,7 @@ PROG=vm #CFLAGS+= SRCS= vm.c -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 5a66295..b3602c4 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -213,7 +213,7 @@ CANONICALOBJDIR:= ${MAKEOBJDIRPREFIX}${.CURDIR} CANONICALOBJDIR:= /usr/obj${.CURDIR} .endif -NOMAN= +NO_MAN= CLEANFILES+= $(CONF) *.o *.lo *.c *.mk *.cache *.a *.h # Program names and their aliases contribute hardlinks to 'rescue' executable, diff --git a/sbin/dhclient/dhcpctl/Makefile b/sbin/dhclient/dhcpctl/Makefile index 15041a1..ec0f27e 100644 --- a/sbin/dhclient/dhcpctl/Makefile +++ b/sbin/dhclient/dhcpctl/Makefile @@ -10,6 +10,6 @@ INTERNALLIB= SRCS= dhcpctl.c callback.c remote.c MAN= dhcpctl.3 -NOMAN= +NO_MAN= .include <bsd.lib.mk> diff --git a/sbin/dhclient/omapip/Makefile b/sbin/dhclient/omapip/Makefile index f597e21..acda115 100644 --- a/sbin/dhclient/omapip/Makefile +++ b/sbin/dhclient/omapip/Makefile @@ -13,6 +13,6 @@ SRCS= alloc.c array.c auth.c buffer.c connection.c convert.c dispatch.c \ message.c mrtrace.c protocol.c result.c support.c toisc.c trace.c MAN= omapi.3 -NOMAN= +NO_MAN= .include <bsd.lib.mk> diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile index d013826..2e9b7c5 100644 --- a/sbin/gvinum/Makefile +++ b/sbin/gvinum/Makefile @@ -2,7 +2,7 @@ PROG= gvinum SRCS= gvinum.c gvinum.h geom_vinum_share.c -NOMAN= # not yet +NO_MAN= # not yet CFLAGS+= -I${.CURDIR}/../../sys diff --git a/sbin/mca/Makefile b/sbin/mca/Makefile index e7729b1..25199d3 100644 --- a/sbin/mca/Makefile +++ b/sbin/mca/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ PROG= mca WARNS?= 4 -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/sbin/recoverdisk/Makefile b/sbin/recoverdisk/Makefile index a3a578d..e86fbb2 100644 --- a/sbin/recoverdisk/Makefile +++ b/sbin/recoverdisk/Makefile @@ -2,7 +2,7 @@ PROG= recoverdisk -NOMAN= +NO_MAN= WARNS?= 5 diff --git a/sbin/rtsol/Makefile b/sbin/rtsol/Makefile index 66d39e5..d3d40e8 100644 --- a/sbin/rtsol/Makefile +++ b/sbin/rtsol/Makefile @@ -21,7 +21,7 @@ SRCS= rtsold.c rtsol.c if.c probe.c rtsock.c CFLAGS+=-DINET6 -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DSMALL WARNS?= 0 -NOMAN= +NO_MAN= .PATH: ${SRCDIR} diff --git a/share/dict/Makefile b/share/dict/Makefile index cf3c9b5..d9e455d 100644 --- a/share/dict/Makefile +++ b/share/dict/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -NOOBJ= +NO_OBJ= # XXX MISSING: connectives words FILES= README propernames web2 web2a freebsd diff --git a/share/doc/IPv6/Makefile b/share/doc/IPv6/Makefile index ed5dce0..62e160c 100644 --- a/share/doc/IPv6/Makefile +++ b/share/doc/IPv6/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= +NO_OBJ= FILES= IMPLEMENTATION FILESDIR= ${SHAREDIR}/doc/IPv6 diff --git a/share/doc/bind9/Makefile b/share/doc/bind9/Makefile index af8cf9a..89d8981 100644 --- a/share/doc/bind9/Makefile +++ b/share/doc/bind9/Makefile @@ -5,7 +5,7 @@ SRCDIR= ${BIND_DIR}/doc .PATH: ${BIND_DIR} ${SRCDIR}/arm ${SRCDIR}/misc -NOOBJ= +NO_OBJ= FILESGROUPS= TOP ARM MISC TOP= CHANGES COPYRIGHT FAQ KNOWN_DEFECTS README diff --git a/share/examples/FreeBSD_version/Makefile b/share/examples/FreeBSD_version/Makefile index 69dc00b..fcfc6b3 100644 --- a/share/examples/FreeBSD_version/Makefile +++ b/share/examples/FreeBSD_version/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= FreeBSD_version -NOMAN= +NO_MAN= install: diff --git a/share/examples/Makefile b/share/examples/Makefile index 0658755..524d38b 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -251,7 +251,7 @@ XFILES= BSD_daemon/FreeBSD.pfa \ BINDIR= ${SHAREDIR}/examples -NOOBJ= +NO_OBJ= # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies''); (latter useful diff --git a/share/examples/autofs/driver/Makefile b/share/examples/autofs/driver/Makefile index 58e7697..7a0f159 100644 --- a/share/examples/autofs/driver/Makefile +++ b/share/examples/autofs/driver/Makefile @@ -4,7 +4,7 @@ PROG=autodriver SRCS= autodriver.c -NOMAN= +NO_MAN= WARNS= 4 CFLAGS+= -g BINDIR?= /sbin diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index ad74d37..86cb3cd 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -128,7 +128,7 @@ #NOLIBTHR= # do not build libthr (1:1 threading library) #NO_LPR= # do not build lpr and related programs #NO_MAILWRAPPER= # do not build the mailwrapper(8) MTA selector -#NOMAN= # do not build manual pages +#NO_MAN= # do not build manual pages #NO_MODULES= # do not build modules with the kernel #NO_NIS= # do not build NIS support and related programs #NO_OBJC= # do not build Objective C support @@ -183,7 +183,7 @@ # If you do not want unformatted manual pages to be compressed # when they are installed: # -#NOMANCOMPRESS= +#NO_MANCOMPRESS= # # # Default format for system documentation, depends on your printer. diff --git a/share/examples/find_interface/Makefile b/share/examples/find_interface/Makefile index 184c641..ac6de9c 100644 --- a/share/examples/find_interface/Makefile +++ b/share/examples/find_interface/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ PROG= find_interface -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/share/examples/ipfilter/Makefile b/share/examples/ipfilter/Makefile index f6574f8..4826dac 100644 --- a/share/examples/ipfilter/Makefile +++ b/share/examples/ipfilter/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= +NO_OBJ= FILES= README diff --git a/share/examples/isdn/v21/Makefile b/share/examples/isdn/v21/Makefile index 0229ebe..261cec1 100644 --- a/share/examples/isdn/v21/Makefile +++ b/share/examples/isdn/v21/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= v21modem -NOMAN= +NO_MAN= DPADD= ${LIBUTIL} ${LIBM} LDADD= -lutil -lm CFLAGS+= -g -Wall diff --git a/share/examples/kld/cdev/test/Makefile b/share/examples/kld/cdev/test/Makefile index ac228f9..333cdcb 100644 --- a/share/examples/kld/cdev/test/Makefile +++ b/share/examples/kld/cdev/test/Makefile @@ -67,7 +67,7 @@ # $FreeBSD$ # PROG= testcdev -NOMAN= +NO_MAN= MODSTAT= /sbin/kldstat diff --git a/share/examples/kld/syscall/test/Makefile b/share/examples/kld/syscall/test/Makefile index 5f11f061..c02d89d 100644 --- a/share/examples/kld/syscall/test/Makefile +++ b/share/examples/kld/syscall/test/Makefile @@ -2,6 +2,6 @@ # $FreeBSD$ PROG = call -NOMAN = +NO_MAN = .include <bsd.prog.mk> diff --git a/share/examples/libvgl/Makefile b/share/examples/libvgl/Makefile index 3f06217..6b4e916 100644 --- a/share/examples/libvgl/Makefile +++ b/share/examples/libvgl/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= demo -NOMAN= +NO_MAN= DPADD= ${LIBVGL} LDADD= -lvgl diff --git a/share/examples/perfmon/Makefile b/share/examples/perfmon/Makefile index e1e7e9f..de59b9e 100644 --- a/share/examples/perfmon/Makefile +++ b/share/examples/perfmon/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= perfmon -NOMAN= +NO_MAN= install: diff --git a/share/examples/pf/Makefile b/share/examples/pf/Makefile index 9abced7..9eabea1 100644 --- a/share/examples/pf/Makefile +++ b/share/examples/pf/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= +NO_OBJ= FILES= faq-example1 faq-example2 faq-example3 \ ackpri queue1 queue2 queue3 queue4 \ diff --git a/share/examples/ppi/Makefile b/share/examples/ppi/Makefile index 7d3627e..9b0d0d5 100644 --- a/share/examples/ppi/Makefile +++ b/share/examples/ppi/Makefile @@ -3,6 +3,6 @@ # $FreeBSD$ PROG= ppilcd -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/share/examples/smbfs/Makefile b/share/examples/smbfs/Makefile index 82c06f5..9e5b99a 100644 --- a/share/examples/smbfs/Makefile +++ b/share/examples/smbfs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= +NO_OBJ= BINDIR= /usr/share/examples/smbfs FILES= dot.nsmbrc diff --git a/share/examples/smbfs/print/Makefile b/share/examples/smbfs/print/Makefile index 0e465db..eb66815 100644 --- a/share/examples/smbfs/print/Makefile +++ b/share/examples/smbfs/print/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= +NO_OBJ= BINDIR= /usr/share/examples/smbfs/print FILES= lj6l ljspool printcap.sample tolj diff --git a/share/info/Makefile b/share/info/Makefile index 024d6ce..0110e02 100644 --- a/share/info/Makefile +++ b/share/info/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -NOOBJ= +NO_OBJ= .include <bsd.prog.mk> diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 6f2a984..03f32c4 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -488,7 +488,7 @@ and related programs. Set to not build the .Xr mailwrapper 8 MTA selector. -.It Va NOMAN +.It Va NO_MAN .Pq Vt bool Set to not build manual pages. .It Va NO_NIS @@ -564,7 +564,7 @@ Set to not build the .Nm libthr (1:1 threading) library. -.It Va NOMANCOMPRESS +.It Va NO_MANCOMPRESS .Pq Vt bool Set to install man pages uncompressed. .It Va NOPROFILE diff --git a/share/misc/Makefile b/share/misc/Makefile index 413b312..975fe76 100644 --- a/share/misc/Makefile +++ b/share/misc/Makefile @@ -4,7 +4,7 @@ FILES= ascii birthtoken bsd-family-tree eqnchar flowers init.ee \ iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \ scsi_modes usb_hid_usages -NOOBJ= +NO_OBJ= FILESDIR= ${BINDIR}/misc .include <bsd.prog.mk> diff --git a/share/mk/Makefile b/share/mk/Makefile index 0a2fe21..326048e 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -2,7 +2,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 FILES= bsd.README -FILES+= bsd.cpu.mk bsd.dep.mk bsd.doc.mk bsd.files.mk +FILES+= bsd.compat.mk bsd.cpu.mk bsd.dep.mk bsd.doc.mk bsd.files.mk FILES+= bsd.incs.mk bsd.info.mk bsd.init.mk FILES+= bsd.kmod.mk FILES+= bsd.lib.mk bsd.libnames.mk bsd.links.mk bsd.man.mk bsd.nls.mk @@ -10,7 +10,7 @@ FILES+= bsd.obj.mk bsd.own.mk FILES+= bsd.port.mk bsd.port.post.mk bsd.port.pre.mk bsd.port.subdir.mk FILES+= bsd.prog.mk bsd.subdir.mk bsd.sys.mk FILES+= sys.mk -NOOBJ= +NO_OBJ= FILESDIR= ${BINDIR}/mk .include <bsd.prog.mk> diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 521f8ac..d8754f1 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -308,7 +308,7 @@ To build foo from foo.c with a manual page foo.2, add the line: If foo does not have a manual page at all, add the line: - NOMAN= noman + NO_MAN= noman If foo has multiple source files, add the line: diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk new file mode 100644 index 0000000..4f02df09 --- /dev/null +++ b/share/mk/bsd.compat.mk @@ -0,0 +1,17 @@ +# $FreeBSD$ + +.if !defined(BURN_BRIDGES) +.for oldnew in \ + NOMAN:NO_MAN \ + NOMANCOMPRESS:NO_MANCOMPRESS \ + NOOBJ:NO_OBJ +.for old in ${oldnew:C/:.*//} +.for new in ${oldnew:C/.*://} +.if defined(${old}) && !defined(${new}) +.warning ${old} is deprecated in favor of ${new} +${new}= ${${old}} +.endif +.endfor +.endfor +.endfor +.endif diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 8e4239e..5b98da7 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -170,7 +170,7 @@ ${LINTLIB}: ${LINTOBJS} all: ${_LIBS} -.if !defined(NOMAN) +.if !defined(NO_MAN) all: _manpages .endif @@ -246,7 +246,7 @@ _libinstall: .include <bsd.incs.mk> .include <bsd.links.mk> -.if !defined(NOMAN) +.if !defined(NO_MAN) realinstall: _maninstall .ORDER: beforeinstall _maninstall .endif @@ -258,7 +258,7 @@ lint: ${SRCS:M*.c} ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC} .endif -.if !defined(NOMAN) +.if !defined(NO_MAN) .include <bsd.man.mk> .endif diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 4a06c58..e10efff 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -30,7 +30,7 @@ # second, and there may be multiple pairs. The files # are hard-linked. # -# NOMANCOMPRESS If you do not want unformatted manual pages to be +# NO_MANCOMPRESS If you do not want unformatted manual pages to be # compressed when they are installed. [not set] # # NOMLINKS If you do not want install manual page links. [not set] @@ -77,10 +77,10 @@ MAN+= ${MAN${sect}} _manpages: all-man: _manpages -.if defined(NOMANCOMPRESS) +.if defined(NO_MANCOMPRESS) # Make special arrangements to filter to a temporary file at build time -# for NOMANCOMPRESS. +# for NO_MANCOMPRESS. .if defined(MANFILTER) FILTEXTENSION= .filt .else @@ -162,7 +162,7 @@ maninstall: _maninstall _maninstall: .if defined(MAN) && !empty(MAN) _maninstall: ${MAN} -.if defined(NOMANCOMPRESS) +.if defined(NO_MANCOMPRESS) .if defined(MANFILTER) .for page in ${MAN} ${MINSTALL} ${page:T:S/$/${FILTEXTENSION}/g} \ diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index 40735ae..40c676b 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -23,7 +23,7 @@ # # E.g. use `env MAKEOBJDIRPREFIX=/somewhere/obj make' # -# NOOBJ Do not create object directories. This should not be set +# NO_OBJ Do not create object directories. This should not be set # if anything is built. # # +++ targets +++ @@ -65,7 +65,7 @@ CANONICALOBJDIR:=/usr/obj${.CURDIR} # issue a warning differentiating between cases 6 and (3 or 4). # objwarn: -.if !defined(NOOBJ) && ${.OBJDIR} != ${CANONICALOBJDIR} && \ +.if !defined(NO_OBJ) && ${.OBJDIR} != ${CANONICALOBJDIR} && \ !(defined(MAKEOBJDIRPREFIX) && exists(${CANONICALOBJDIR}/)) && \ !(defined(MAKEOBJDIR) && exists(${MAKEOBJDIR}/)) .if ${.OBJDIR} == ${.CURDIR} @@ -76,7 +76,7 @@ objwarn: .endif .endif -.if !defined(NOOBJ) +.if !defined(NO_OBJ) .if !target(obj) obj: .PHONY @if ! test -d ${CANONICALOBJDIR}/; then \ @@ -98,7 +98,7 @@ objlink: echo "No ${CANONICALOBJDIR} to link to - do a make obj."; \ fi .endif -.endif !defined(NOOBJ) +.endif !defined(NO_OBJ) # # where would that obj directory be? diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index a37e179..5d08816 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -74,7 +74,7 @@ ${PROG}: ${OBJS} .endif -.if !defined(NOMAN) && !defined(MAN) && \ +.if !defined(NO_MAN) && !defined(MAN) && \ !defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \ !defined(MAN4) && !defined(MAN5) && !defined(MAN6) && \ !defined(MAN7) && !defined(MAN8) && !defined(MAN9) && \ @@ -85,7 +85,7 @@ MAN1= ${MAN} .endif all: objwarn ${PROG} ${SCRIPTS} -.if !defined(NOMAN) +.if !defined(NO_MAN) all: _manpages .endif @@ -177,7 +177,7 @@ NLSNAME?= ${PROG} .include <bsd.incs.mk> .include <bsd.links.mk> -.if !defined(NOMAN) +.if !defined(NO_MAN) realinstall: _maninstall .ORDER: beforeinstall _maninstall .endif @@ -191,7 +191,7 @@ lint: ${SRCS:M*.c} .endif .endif -.if !defined(NOMAN) +.if !defined(NO_MAN) .include <bsd.man.mk> .endif diff --git a/share/security/Makefile b/share/security/Makefile index 8303eea..c25a52d 100644 --- a/share/security/Makefile +++ b/share/security/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ FILES= lomac-policy.contexts -NOOBJ= +NO_OBJ= FILESDIR= ${BINDIR}/security .include "${.CURDIR}/../Makefile.inc" diff --git a/share/sendmail/Makefile b/share/sendmail/Makefile index 2b4a9d1..ef5fd38 100644 --- a/share/sendmail/Makefile +++ b/share/sendmail/Makefile @@ -9,7 +9,7 @@ CFFILES!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name CVS -prune \) -o -type DDIR= ${DESTDIR}/usr/share/sendmail -NOOBJ= +NO_OBJ= # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies'') diff --git a/share/skel/Makefile b/share/skel/Makefile index 0422a87..ffe8015 100644 --- a/share/skel/Makefile +++ b/share/skel/Makefile @@ -9,6 +9,6 @@ FILES1DIR= /usr/share/skel FILES2DIR= /usr/share/skel FILES1MODE= 0644 FILES2MODE= 0600 -NOOBJ= +NO_OBJ= .include <bsd.prog.mk> diff --git a/share/snmp/mibs/Makefile b/share/snmp/mibs/Makefile index e79dbc0..8de73c9 100644 --- a/share/snmp/mibs/Makefile +++ b/share/snmp/mibs/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ FILES= FREEBSD-MIB.txt -NOOBJ= +NO_OBJ= FILESDIR= ${SHAREDIR}/snmp/mibs .include <bsd.prog.mk> diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile index 534630d..e915309 100644 --- a/share/syscons/fonts/Makefile +++ b/share/syscons/fonts/Makefile @@ -32,6 +32,6 @@ FILES= armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \ FILESDIR= ${SHAREDIR}/syscons/fonts -NOOBJ= +NO_OBJ= .include <bsd.prog.mk> diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile index aa7d1ca..d803988 100644 --- a/share/syscons/keymaps/Makefile +++ b/share/syscons/keymaps/Makefile @@ -45,6 +45,6 @@ FILES= INDEX.keymaps \ FILESDIR= ${SHAREDIR}/syscons/keymaps -NOOBJ= +NO_OBJ= .include <bsd.prog.mk> diff --git a/sys/boot/alpha/boot1/Makefile b/sys/boot/alpha/boot1/Makefile index 62241a2..666fd14 100644 --- a/sys/boot/alpha/boot1/Makefile +++ b/sys/boot/alpha/boot1/Makefile @@ -3,7 +3,7 @@ PROG= boot1.sym INTERNALPROG= -NOMAN= +NO_MAN= LINKS= ${BINDIR}/boot1 ${BINDIR}/boot .PATH: ${.CURDIR}/../libalpha diff --git a/sys/boot/alpha/cdboot/Makefile b/sys/boot/alpha/cdboot/Makefile index f65d901..632f8e5 100644 --- a/sys/boot/alpha/cdboot/Makefile +++ b/sys/boot/alpha/cdboot/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ BOOT= cdboot -NOMAN= +NO_MAN= NEWVERSWHAT= "SRM CD9660 boot" alpha LOAD_ADDRESS= ${PRIMARY_LOAD_ADDRESS} diff --git a/sys/boot/alpha/netboot/Makefile b/sys/boot/alpha/netboot/Makefile index 584895e..f3d7d67 100644 --- a/sys/boot/alpha/netboot/Makefile +++ b/sys/boot/alpha/netboot/Makefile @@ -2,7 +2,7 @@ # $NetBSD: Makefile,v 1.12 1998/02/19 14:18:36 drochner Exp $ BOOT= netboot -NOMAN= +NO_MAN= NEWVERSWHAT= "SRM net boot" alpha LOAD_ADDRESS= ${PRIMARY_LOAD_ADDRESS} diff --git a/sys/boot/arc/loader/Makefile b/sys/boot/arc/loader/Makefile index e7b7457..b9a7e75 100644 --- a/sys/boot/arc/loader/Makefile +++ b/sys/boot/arc/loader/Makefile @@ -3,7 +3,7 @@ BASE= loader PROG= ${BASE}.exe -NOMAN= +NO_MAN= NEWVERSWHAT= "ARC disk boot" ${MACHINE_ARCH} .PATH: ${.CURDIR}/../common diff --git a/sys/boot/i386/boot0/Makefile b/sys/boot/i386/boot0/Makefile index 6b767d0..979ad2f 100644 --- a/sys/boot/i386/boot0/Makefile +++ b/sys/boot/i386/boot0/Makefile @@ -3,7 +3,7 @@ PROG?= boot0 STRIP= BINMODE=${NOBINMODE} -NOMAN= +NO_MAN= SRCS= ${PROG}.S # The default set of flags compiled into boot0. This enables update (writing diff --git a/sys/boot/i386/btx/btx/Makefile b/sys/boot/i386/btx/btx/Makefile index a4e78a7..bac945b3 100644 --- a/sys/boot/i386/btx/btx/Makefile +++ b/sys/boot/i386/btx/btx/Makefile @@ -2,7 +2,7 @@ PROG= btx INTERNALPROG= -NOMAN= +NO_MAN= SRCS= btx.S .if defined(PAGING) diff --git a/sys/boot/i386/btx/btxldr/Makefile b/sys/boot/i386/btx/btxldr/Makefile index 551c292..ba7a993 100644 --- a/sys/boot/i386/btx/btxldr/Makefile +++ b/sys/boot/i386/btx/btxldr/Makefile @@ -2,7 +2,7 @@ PROG= btxldr INTERNALPROG= -NOMAN= +NO_MAN= SRCS= btxldr.S CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRESS} diff --git a/sys/boot/i386/btx/lib/Makefile b/sys/boot/i386/btx/lib/Makefile index 563f001..8fab66a 100644 --- a/sys/boot/i386/btx/lib/Makefile +++ b/sys/boot/i386/btx/lib/Makefile @@ -2,7 +2,7 @@ PROG= crt0.o INTERNALPROG= -NOMAN= +NO_MAN= SRCS= btxcsu.s btxsys.s btxv86.s LDFLAGS=-Wl,-r diff --git a/sys/boot/i386/cdboot/Makefile b/sys/boot/i386/cdboot/Makefile index ddca825..77c4b8e 100644 --- a/sys/boot/i386/cdboot/Makefile +++ b/sys/boot/i386/cdboot/Makefile @@ -3,7 +3,7 @@ PROG= cdboot STRIP= BINMODE=${NOBINMODE} -NOMAN= +NO_MAN= SRCS= ${PROG}.s ORG= 0x7c00 diff --git a/sys/boot/i386/kgzldr/Makefile b/sys/boot/i386/kgzldr/Makefile index d25e849..eb098a2 100644 --- a/sys/boot/i386/kgzldr/Makefile +++ b/sys/boot/i386/kgzldr/Makefile @@ -4,7 +4,7 @@ PROG= kgzldr.o STRIP= BINMODE=${LIBMODE} BINDIR= ${LIBDIR} -NOMAN= +NO_MAN= SRCS= start.s boot.c inflate.c lib.c crt.s sio.s CFLAGS= -Os diff --git a/sys/boot/i386/mbr/Makefile b/sys/boot/i386/mbr/Makefile index e36257f..7acda10 100644 --- a/sys/boot/i386/mbr/Makefile +++ b/sys/boot/i386/mbr/Makefile @@ -3,7 +3,7 @@ PROG= mbr STRIP= BINMODE=${NOBINMODE} -NOMAN= +NO_MAN= SRCS= ${PROG}.s # MBR flags: 0x80 -- try packet interface (also known as EDD or LBA) diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile index a3b126f..9e38fde 100644 --- a/sys/boot/ia64/efi/Makefile +++ b/sys/boot/ia64/efi/Makefile @@ -3,7 +3,7 @@ PROG= loader.sym INTERNALPROG= SRCS= conf.c dev_net.c efimd.c main.c start.S vers.c -NOMAN= +NO_MAN= CFLAGS+= -DLOADER CFLAGS+= -I${.CURDIR}/../../efi/include diff --git a/sys/boot/ia64/ski/Makefile b/sys/boot/ia64/ski/Makefile index 02921dc..2acf551 100644 --- a/sys/boot/ia64/ski/Makefile +++ b/sys/boot/ia64/ski/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= skiload -NOMAN= +NO_MAN= NEWVERSWHAT= "ia64 SKI boot" ${MACHINE_ARCH} STRIP= # We must not strip skiload at install time. diff --git a/sys/boot/pc98/boot0.5/Makefile b/sys/boot/pc98/boot0.5/Makefile index c9028ee..6b54dd0 100644 --- a/sys/boot/pc98/boot0.5/Makefile +++ b/sys/boot/pc98/boot0.5/Makefile @@ -3,7 +3,7 @@ PROG= ${BOOT}.out INTERNALPROG= FILES= ${BOOT} -NOMAN= +NO_MAN= SRCS= start.s boot.s boot0.5.s disk.s selector.s support.s syscons.s CLEANFILES= ${BOOT} ${BOOT}.bin diff --git a/sys/boot/pc98/boot0/Makefile b/sys/boot/pc98/boot0/Makefile index a4decfe..be4577c 100644 --- a/sys/boot/pc98/boot0/Makefile +++ b/sys/boot/pc98/boot0/Makefile @@ -3,7 +3,7 @@ PROG= ${BOOT}.out INTERNALPROG= FILES= ${BOOT} -NOMAN= +NO_MAN= SRCS= ${BOOT}.s CLEANFILES= ${BOOT} diff --git a/sys/boot/pc98/boot2/Makefile b/sys/boot/pc98/boot2/Makefile index 258b151..b6f3c91 100644 --- a/sys/boot/pc98/boot2/Makefile +++ b/sys/boot/pc98/boot2/Makefile @@ -50,7 +50,7 @@ CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED} CLEANFILES+= boot.nohdr boot.strip boot.ldr boot1 boot2 sizetest LDFLAGS+= -N -Ttext 0 -e start NOSHARED= YES -NOMAN= +NO_MAN= STRIP= # tunable timeout parameter, waiting for keypress, calibrated in ms diff --git a/sys/boot/pc98/btx/btx/Makefile b/sys/boot/pc98/btx/btx/Makefile index 7780e6b..c9517ea 100644 --- a/sys/boot/pc98/btx/btx/Makefile +++ b/sys/boot/pc98/btx/btx/Makefile @@ -2,7 +2,7 @@ PROG= btx INTERNALPROG= -NOMAN= +NO_MAN= SRCS= btx.S CFLAGS+=-DPC98 diff --git a/sys/boot/pc98/btx/btxldr/Makefile b/sys/boot/pc98/btx/btxldr/Makefile index 0cbed49..726149f 100644 --- a/sys/boot/pc98/btx/btxldr/Makefile +++ b/sys/boot/pc98/btx/btxldr/Makefile @@ -2,7 +2,7 @@ PROG= btxldr INTERNALPROG= -NOMAN= +NO_MAN= SRCS= btxldr.S CFLAGS+=-DPC98 diff --git a/sys/boot/pc98/btx/lib/Makefile b/sys/boot/pc98/btx/lib/Makefile index 563f001..8fab66a 100644 --- a/sys/boot/pc98/btx/lib/Makefile +++ b/sys/boot/pc98/btx/lib/Makefile @@ -2,7 +2,7 @@ PROG= crt0.o INTERNALPROG= -NOMAN= +NO_MAN= SRCS= btxcsu.s btxsys.s btxv86.s LDFLAGS=-Wl,-r diff --git a/sys/boot/pc98/kgzldr/Makefile b/sys/boot/pc98/kgzldr/Makefile index 1c423d8..ca41781 100644 --- a/sys/boot/pc98/kgzldr/Makefile +++ b/sys/boot/pc98/kgzldr/Makefile @@ -4,7 +4,7 @@ PROG= kgzldr.o STRIP= BINMODE=${LIBMODE} BINDIR= ${LIBDIR} -NOMAN= +NO_MAN= SRCS= start.s boot.c inflate.c lib.c crt.s sio.s CFLAGS= -Os diff --git a/sys/boot/sparc64/boot1/Makefile b/sys/boot/sparc64/boot1/Makefile index 93d213d..9670678 100644 --- a/sys/boot/sparc64/boot1/Makefile +++ b/sys/boot/sparc64/boot1/Makefile @@ -2,7 +2,7 @@ PROG= boot1.elf INTERNALPROG= -NOMAN= +NO_MAN= FILES= boot1 SRCS= _start.s boot1.c diff --git a/sys/crypto/rijndael/Makefile b/sys/crypto/rijndael/Makefile index 59f8e1c..d2dc35e 100644 --- a/sys/crypto/rijndael/Makefile +++ b/sys/crypto/rijndael/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG=test00 -NOMAN= +NO_MAN= SRCS= ${PROG}.c rijndael-alg-fst.c rijndael-api-fst.c CFLAGS += -I${.CURDIR}/../.. -g -static diff --git a/sys/dev/aic7xxx/aicasm/Makefile b/sys/dev/aic7xxx/aicasm/Makefile index 41499b2..e89fd34 100644 --- a/sys/dev/aic7xxx/aicasm/Makefile +++ b/sys/dev/aic7xxx/aicasm/Makefile @@ -33,7 +33,7 @@ CFLAGS+= ${NOSTDINC} -I/usr/include -I. .ifdef MAKESRCPATH CFLAGS+= -I${MAKESRCPATH} .endif -NOMAN= +NO_MAN= YFLAGS= -b ${.TARGET:R} ${.TARGET:M*macro*:S/$(.TARGET)/-p mm/} -d LFLAGS+= ${.TARGET:M*macro*:S/$(.TARGET)/-Pmm/} diff --git a/sys/dev/patm/genrtab/Makefile b/sys/dev/patm/genrtab/Makefile index a46a04b..a4f5032 100644 --- a/sys/dev/patm/genrtab/Makefile +++ b/sys/dev/patm/genrtab/Makefile @@ -6,7 +6,7 @@ PROG= genrtab INTERNALPROG= WARNS?= 5 -NOMAN= +NO_MAN= DPADD= ${LIBM} LDADD= -lm diff --git a/sys/modules/acpi/acpi_video/Makefile b/sys/modules/acpi/acpi_video/Makefile index 8adfd1c..5ee3ab4 100644 --- a/sys/modules/acpi/acpi_video/Makefile +++ b/sys/modules/acpi/acpi_video/Makefile @@ -7,6 +7,6 @@ WARNS?= 2 CFLAGS+= -I@/contrib/dev/acpica SRCS= acpi_video.c SRCS+= opt_acpi.h acpi_if.h bus_if.h device_if.h -NOMAN= +NO_MAN= .include <bsd.kmod.mk> diff --git a/sys/modules/cp/Makefile b/sys/modules/cp/Makefile index fdf2695..fb8d951 100644 --- a/sys/modules/cp/Makefile +++ b/sys/modules/cp/Makefile @@ -6,7 +6,7 @@ KMOD = if_cp SRCS = if_cp.c cpddk.c SRCS += opt_netgraph.h opt_ng_cronyx.h device_if.h bus_if.h bpf.h\ pci_if.h sppp.h -NOMAN= +NO_MAN= NBPF?= 0 PROTOS?= -DINET diff --git a/tools/KSE/ksetest/Makefile b/tools/KSE/ksetest/Makefile index b5838f2..885d069 100644 --- a/tools/KSE/ksetest/Makefile +++ b/tools/KSE/ksetest/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= ksetest -NOMAN= +NO_MAN= CFLAGS+= -g -Wall SRCS= kse_asm.S kse_threads_test.c diff --git a/tools/KSE/rr/Makefile b/tools/KSE/rr/Makefile index b97d263..45e1dbb 100644 --- a/tools/KSE/rr/Makefile +++ b/tools/KSE/rr/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= rr -NOMAN= +NO_MAN= CFLAGS+= -g -Wall SRCS= kse_asm.S rr.c diff --git a/tools/diag/dumpvfscache/Makefile b/tools/diag/dumpvfscache/Makefile index 312bec3..167bf8a 100644 --- a/tools/diag/dumpvfscache/Makefile +++ b/tools/diag/dumpvfscache/Makefile @@ -4,7 +4,7 @@ PROG= dumpvfscache DPADD= ${LIBKVM} LDADD= -lkvm -NOMAN= +NO_MAN= test: ${PROG} ./${PROG} > a diff --git a/tools/diag/localeck/Makefile b/tools/diag/localeck/Makefile index a09e400..da4fe7f 100644 --- a/tools/diag/localeck/Makefile +++ b/tools/diag/localeck/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= localeck -NOMAN= +NO_MAN= WARNS?= 4 LOCALEDIR?= /usr/share/locale diff --git a/tools/regression/aio/aiotest/Makefile b/tools/regression/aio/aiotest/Makefile index 4b83caf..e8dff68 100644 --- a/tools/regression/aio/aiotest/Makefile +++ b/tools/regression/aio/aiotest/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= aiotest -NOMAN= YES +NO_MAN= YES DPADD= ${LIBUTIL} LDADD= -lutil diff --git a/tools/regression/fsx/Makefile b/tools/regression/fsx/Makefile index 45dc649..687e7dd 100644 --- a/tools/regression/fsx/Makefile +++ b/tools/regression/fsx/Makefile @@ -2,6 +2,6 @@ PROG= fsx -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/tools/regression/gaithrstress/Makefile b/tools/regression/gaithrstress/Makefile index c8b1e18f..2506e01 100644 --- a/tools/regression/gaithrstress/Makefile +++ b/tools/regression/gaithrstress/Makefile @@ -3,5 +3,5 @@ PROG= gaithrstress LDADD+= -pthread -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/tools/regression/geom/ConfCmp/Makefile b/tools/regression/geom/ConfCmp/Makefile index 8cd1661..3be5e70f1 100644 --- a/tools/regression/geom/ConfCmp/Makefile +++ b/tools/regression/geom/ConfCmp/Makefile @@ -6,7 +6,7 @@ SRCS+= subr_sbuf.c .PATH: ../../../../sys/kern -NOOBJ= +NO_OBJ= WARNS?= 5 CFLAGS+= -g -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -static # Uncomment for ElectricFence @@ -15,7 +15,7 @@ CFLAGS+= -g -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith - DPADD += ${LIBBSDXML} LDADD += -lbsdxml -NOMAN= +NO_MAN= CLEANFILES += _* .include <bsd.prog.mk> diff --git a/tools/regression/geom/MdLoad/Makefile b/tools/regression/geom/MdLoad/Makefile index 57fd8f1..7bf18af 100644 --- a/tools/regression/geom/MdLoad/Makefile +++ b/tools/regression/geom/MdLoad/Makefile @@ -4,7 +4,7 @@ PROG= MdLoad DPADD= ${LIBSBUF} ${LIBBSDXML} LDADD= -lsbuf -lbsdxml -NOMAN= +NO_MAN= WARNS?= 4 diff --git a/tools/regression/ia64_unaligned/Makefile b/tools/regression/ia64_unaligned/Makefile index de17b19..69da89f 100644 --- a/tools/regression/ia64_unaligned/Makefile +++ b/tools/regression/ia64_unaligned/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ PROG= unaligned -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/tools/regression/include/tgmath/Makefile b/tools/regression/include/tgmath/Makefile index 3ed7480..64626c5 100644 --- a/tools/regression/include/tgmath/Makefile +++ b/tools/regression/include/tgmath/Makefile @@ -2,6 +2,6 @@ PROG= tgmath CFLAGS+= -fno-builtin -std=c99 -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/tools/regression/netatalk/simple_send/Makefile b/tools/regression/netatalk/simple_send/Makefile index 9fa445c..e01fcea 100644 --- a/tools/regression/netatalk/simple_send/Makefile +++ b/tools/regression/netatalk/simple_send/Makefile @@ -3,6 +3,6 @@ # PROG= simple_send -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/tools/regression/netinet/ipsockopt/Makefile b/tools/regression/netinet/ipsockopt/Makefile index dd83aa9..c49ee6c 100644 --- a/tools/regression/netinet/ipsockopt/Makefile +++ b/tools/regression/netinet/ipsockopt/Makefile @@ -3,6 +3,6 @@ # PROG= ipsockopt -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/tools/regression/netinet/tcpconnect/Makefile b/tools/regression/netinet/tcpconnect/Makefile index 9d5a8d9..3456ff5 100644 --- a/tools/regression/netinet/tcpconnect/Makefile +++ b/tools/regression/netinet/tcpconnect/Makefile @@ -3,6 +3,6 @@ # PROG= tcpconnect -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/tools/regression/netinet/tcpfullwindowrst/Makefile b/tools/regression/netinet/tcpfullwindowrst/Makefile index 134c32d..91641cd 100644 --- a/tools/regression/netinet/tcpfullwindowrst/Makefile +++ b/tools/regression/netinet/tcpfullwindowrst/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ PROG= tcpfullwindowrsttest -NOMAN= noman +NO_MAN= noman .include <bsd.prog.mk> diff --git a/tools/regression/netinet/tcpstream/Makefile b/tools/regression/netinet/tcpstream/Makefile index 0da68d9..6f6491a 100644 --- a/tools/regression/netinet/tcpstream/Makefile +++ b/tools/regression/netinet/tcpstream/Makefile @@ -4,6 +4,6 @@ CFLAGS+= -Wall PROG= tcpstream -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/tools/regression/nfsmmap/test1/Makefile b/tools/regression/nfsmmap/test1/Makefile index e18acbe..07c3445 100644 --- a/tools/regression/nfsmmap/test1/Makefile +++ b/tools/regression/nfsmmap/test1/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= test1 -NOMAN= +NO_MAN= NFSSERVER?= herring.nlsystems.com CLEANFILES= test1.zeros test1.good test1.data test1.scratch diff --git a/tools/regression/nfsmmap/test2/Makefile b/tools/regression/nfsmmap/test2/Makefile index 6b5ed59..113a3b3 100644 --- a/tools/regression/nfsmmap/test2/Makefile +++ b/tools/regression/nfsmmap/test2/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= test2 -NOMAN= +NO_MAN= NFSSERVER?= herring.nlsystems.com CLEANFILES= test2.zeros test2.good test2.data test2.scratch diff --git a/tools/regression/p1003_1b/Makefile b/tools/regression/p1003_1b/Makefile index d137245..85db354 100644 --- a/tools/regression/p1003_1b/Makefile +++ b/tools/regression/p1003_1b/Makefile @@ -11,7 +11,7 @@ SRCS=\ sched.c \ yield.c -NOMAN= +NO_MAN= CFLAGS+=-DNO_MEMLOCK .include <bsd.prog.mk> diff --git a/tools/regression/pipe/Makefile b/tools/regression/pipe/Makefile index 9d22373..cf73253 100644 --- a/tools/regression/pipe/Makefile +++ b/tools/regression/pipe/Makefile @@ -4,7 +4,7 @@ # "make" then "make regress". # PROG= bigpipetest -NOMAN= +NO_MAN= regress: @if ./bigpipetest; then \ diff --git a/tools/regression/security/access/Makefile b/tools/regression/security/access/Makefile index 16e796f..7ec3999 100644 --- a/tools/regression/security/access/Makefile +++ b/tools/regression/security/access/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= testaccess -NOMAN= +NO_MAN= SRCS= testaccess.c CFLAGS += -Wall diff --git a/tools/regression/security/proc_to_proc/Makefile b/tools/regression/security/proc_to_proc/Makefile index 3950943..ad09f7a6 100644 --- a/tools/regression/security/proc_to_proc/Makefile +++ b/tools/regression/security/proc_to_proc/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= testuid -NOMAN= +NO_MAN= ADDITIONAL_FLAGS=-DSETSUGID_SUPPORTED #ADDITIONAL_FLAGS= -DSETSUGID_SUPPORTED_BUT_NO_LIBC_STUB diff --git a/tools/regression/sockets/accept_fd_leak/Makefile b/tools/regression/sockets/accept_fd_leak/Makefile index 7512f89..efcaa16 100644 --- a/tools/regression/sockets/accept_fd_leak/Makefile +++ b/tools/regression/sockets/accept_fd_leak/Makefile @@ -3,7 +3,7 @@ # PROG= accept_fd_leak -NOMAN= +NO_MAN= regress: ./accept_fd_leak diff --git a/tools/regression/sockets/accf_data_attach/Makefile b/tools/regression/sockets/accf_data_attach/Makefile index 0110cbb..736c796 100644 --- a/tools/regression/sockets/accf_data_attach/Makefile +++ b/tools/regression/sockets/accf_data_attach/Makefile @@ -3,7 +3,7 @@ # PROG= accf_data_attach -NOMAN= +NO_MAN= accf_data_attach: accf_data_attach.c gcc -Wall -o accf_data_attach accf_data_attach.c diff --git a/tools/regression/sockets/kqueue/Makefile b/tools/regression/sockets/kqueue/Makefile index b66f7bb..53d34a9 100644 --- a/tools/regression/sockets/kqueue/Makefile +++ b/tools/regression/sockets/kqueue/Makefile @@ -3,6 +3,6 @@ # PROG= kqueue -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/tools/regression/sockets/listenclose/Makefile b/tools/regression/sockets/listenclose/Makefile index d2b1fc2..88b29a6 100644 --- a/tools/regression/sockets/listenclose/Makefile +++ b/tools/regression/sockets/listenclose/Makefile @@ -3,7 +3,7 @@ # PROG= listenclose -NOMAN= yes +NO_MAN= yes WARNS= 2 .include <bsd.prog.mk> diff --git a/tools/regression/sockets/socketpair/Makefile b/tools/regression/sockets/socketpair/Makefile index 2c51e89..3d1b34e 100644 --- a/tools/regression/sockets/socketpair/Makefile +++ b/tools/regression/sockets/socketpair/Makefile @@ -3,7 +3,7 @@ # PROG= socketpair -NOMAN= +NO_MAN= socketpair: socketpair.c gcc -Wall -o socketpair socketpair.c diff --git a/tools/regression/sysvmsg/Makefile b/tools/regression/sysvmsg/Makefile index ec23650..6892abb 100644 --- a/tools/regression/sysvmsg/Makefile +++ b/tools/regression/sysvmsg/Makefile @@ -3,7 +3,7 @@ # Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:56:59 thorpej Exp $ PROG= msgtest -NOMAN= +NO_MAN= regress: @if ./msgtest ./msgtest; then \ diff --git a/tools/regression/sysvsem/Makefile b/tools/regression/sysvsem/Makefile index 4426ccc..5546b62 100644 --- a/tools/regression/sysvsem/Makefile +++ b/tools/regression/sysvsem/Makefile @@ -3,7 +3,7 @@ # Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:57:00 thorpej Exp $ PROG= semtest -NOMAN= +NO_MAN= regress: @if ./semtest ./semtest; then \ diff --git a/tools/regression/sysvshm/Makefile b/tools/regression/sysvshm/Makefile index d34b203..f26b4a7 100644 --- a/tools/regression/sysvshm/Makefile +++ b/tools/regression/sysvshm/Makefile @@ -3,7 +3,7 @@ # Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:57:00 thorpej Exp $ PROG= shmtest -NOMAN= +NO_MAN= regress: @if ./shmtest ./shmtest; then \ diff --git a/tools/regression/tls/libxx/Makefile b/tools/regression/tls/libxx/Makefile index c3c853d..5375f93 100644 --- a/tools/regression/tls/libxx/Makefile +++ b/tools/regression/tls/libxx/Makefile @@ -5,6 +5,6 @@ SHLIB_MAJOR= 1 SRCS= xx.c #CFLAGS+=-mtls-dialect=sun -NOMAN= +NO_MAN= .include <bsd.lib.mk> diff --git a/tools/regression/tls/libyy/Makefile b/tools/regression/tls/libyy/Makefile index e9627e4..0acd9ee 100644 --- a/tools/regression/tls/libyy/Makefile +++ b/tools/regression/tls/libyy/Makefile @@ -5,6 +5,6 @@ SHLIB_MAJOR= 1 SRCS= yy.c CFLAGS+=-fpic -NOMAN= +NO_MAN= .include <bsd.lib.mk> diff --git a/tools/regression/tls/ttls1/Makefile b/tools/regression/tls/ttls1/Makefile index 5a5e58a..d3b6e65 100644 --- a/tools/regression/tls/ttls1/Makefile +++ b/tools/regression/tls/ttls1/Makefile @@ -3,7 +3,7 @@ PROG= ttls1 LDADD+= -L../libxx -lxx -Wl,--rpath=${.OBJDIR}/../libxx LDADD+= -L../libyy -lyy -Wl,--rpath=${.OBJDIR}/../libyy -NOMAN= +NO_MAN= DEBUG_FLAGS= -g .include <bsd.prog.mk> diff --git a/tools/regression/tls/ttls2/Makefile b/tools/regression/tls/ttls2/Makefile index ba348a4..0a3bc95 100644 --- a/tools/regression/tls/ttls2/Makefile +++ b/tools/regression/tls/ttls2/Makefile @@ -2,7 +2,7 @@ PROG= ttls2 LDADD+= -lpthread -NOMAN= +NO_MAN= DEBUG_FLAGS= -g .include <bsd.prog.mk> diff --git a/tools/test/malloc/Makefile b/tools/test/malloc/Makefile index 7487815..7d60670 100644 --- a/tools/test/malloc/Makefile +++ b/tools/test/malloc/Makefile @@ -3,7 +3,7 @@ PROG= malloc SRCS= main.c .PATH: ${.CURDIR}/../../../lib/libc/stdlib -NOMAN= +NO_MAN= test: malloc @echo diff --git a/tools/test/ppsapi/Makefile b/tools/test/ppsapi/Makefile index bf46cc6..f0110ed 100644 --- a/tools/test/ppsapi/Makefile +++ b/tools/test/ppsapi/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= ppsapitest -NOMAN= +NO_MAN= WARNS?= 5 diff --git a/tools/tools/aac/Makefile b/tools/tools/aac/Makefile index 337cc31..d245d47 100644 --- a/tools/tools/aac/Makefile +++ b/tools/tools/aac/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= aac_checkq -NOMAN= +NO_MAN= BINDIR?=/usr/local/bin .include <bsd.prog.mk> diff --git a/tools/tools/find-sb/Makefile b/tools/tools/find-sb/Makefile index 26d4706..b70e2c6 100644 --- a/tools/tools/find-sb/Makefile +++ b/tools/tools/find-sb/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ PROG= find-sb -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/tools/tools/gdb_regofs/Makefile b/tools/tools/gdb_regofs/Makefile index b439650..5f5a7e3 100644 --- a/tools/tools/gdb_regofs/Makefile +++ b/tools/tools/gdb_regofs/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ PROG=gdb_regofs SRCS=${MACHINE_ARCH}.c -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/tools/tools/ifinfo/Makefile b/tools/tools/ifinfo/Makefile index 2fe0e83..440c39c6 100644 --- a/tools/tools/ifinfo/Makefile +++ b/tools/tools/ifinfo/Makefile @@ -2,6 +2,6 @@ PROG= ifinfo SRCS= ifinfo.c rfc1650.c -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/tools/tools/ministat/Makefile b/tools/tools/ministat/Makefile index 547e4bc..62de6a0 100644 --- a/tools/tools/ministat/Makefile +++ b/tools/tools/ministat/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ PROG= ministat -NOMAN= +NO_MAN= DPADD= ${LIBM} LDADD= -lm diff --git a/tools/tools/nanobsd/make.conf b/tools/tools/nanobsd/make.conf index 2d48744..b6e5c6b 100644 --- a/tools/tools/nanobsd/make.conf +++ b/tools/tools/nanobsd/make.conf @@ -26,7 +26,7 @@ NO_IPFILTER= NO_KERBEROS= NOLIBTHR= NO_LPR= -NOMAN= +NO_MAN= NO_MODULES= NO_NIS= NO_OBJC= diff --git a/tools/tools/netrate/netblast/Makefile b/tools/tools/netrate/netblast/Makefile index 0f5afc9..7e51860e 100644 --- a/tools/tools/netrate/netblast/Makefile +++ b/tools/tools/netrate/netblast/Makefile @@ -3,6 +3,6 @@ # PROG= netblast -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/tools/tools/netrate/netreceive/Makefile b/tools/tools/netrate/netreceive/Makefile index f3bb15a..ef2b09b 100644 --- a/tools/tools/netrate/netreceive/Makefile +++ b/tools/tools/netrate/netreceive/Makefile @@ -3,6 +3,6 @@ # PROG= netreceive -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/tools/tools/netrate/netsend/Makefile b/tools/tools/netrate/netsend/Makefile index 3225f09..2b11958 100644 --- a/tools/tools/netrate/netsend/Makefile +++ b/tools/tools/netrate/netsend/Makefile @@ -4,6 +4,6 @@ CFLAGS+= -Wall PROG= netsend -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/tools/tools/pirtool/Makefile b/tools/tools/pirtool/Makefile index a799952..18e6bb8 100644 --- a/tools/tools/pirtool/Makefile +++ b/tools/tools/pirtool/Makefile @@ -2,6 +2,6 @@ PROG= pirtool SRCS= pirtool.c -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/tools/tools/recoverdisk/Makefile b/tools/tools/recoverdisk/Makefile index a3a578d..e86fbb2 100644 --- a/tools/tools/recoverdisk/Makefile +++ b/tools/tools/recoverdisk/Makefile @@ -2,7 +2,7 @@ PROG= recoverdisk -NOMAN= +NO_MAN= WARNS?= 5 diff --git a/tools/tools/syscall_timing/Makefile b/tools/tools/syscall_timing/Makefile index 4f8f663..684477b 100644 --- a/tools/tools/syscall_timing/Makefile +++ b/tools/tools/syscall_timing/Makefile @@ -4,6 +4,6 @@ PROG= syscall_timing CFLAGS+= -static -O -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/usr.bin/alias/Makefile b/usr.bin/alias/Makefile index fbfcd11..53df717 100644 --- a/usr.bin/alias/Makefile +++ b/usr.bin/alias/Makefile @@ -2,7 +2,7 @@ SCRIPTS=generic.sh SCRIPTSNAME=alias -NOOBJ= +NO_OBJ= LINKS= ${BINDIR}/alias ${BINDIR}/bg \ ${BINDIR}/alias ${BINDIR}/cd \ diff --git a/usr.bin/bzip2recover/Makefile b/usr.bin/bzip2recover/Makefile index d8c412a..7f61946 100644 --- a/usr.bin/bzip2recover/Makefile +++ b/usr.bin/bzip2recover/Makefile @@ -4,6 +4,6 @@ BZ2DIR= ${.CURDIR}/../../contrib/bzip2 .PATH: ${BZ2DIR} PROG= bzip2recover -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/usr.bin/dirname/Makefile b/usr.bin/dirname/Makefile index b6a8911..7703897 100644 --- a/usr.bin/dirname/Makefile +++ b/usr.bin/dirname/Makefile @@ -2,6 +2,6 @@ # $FreeBSD$ PROG= dirname -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/usr.bin/elf2aout/Makefile b/usr.bin/elf2aout/Makefile index 2947869..92bb6598 100644 --- a/usr.bin/elf2aout/Makefile +++ b/usr.bin/elf2aout/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= elf2aout -NOMAN= +NO_MAN= NO_WERROR= WARNS?= 5 diff --git a/usr.bin/lessecho/Makefile b/usr.bin/lessecho/Makefile index bfe81d6..0688e83 100644 --- a/usr.bin/lessecho/Makefile +++ b/usr.bin/lessecho/Makefile @@ -2,7 +2,7 @@ PROG= lessecho SRCS= lessecho.c version.c -NOMAN= +NO_MAN= .include "${.CURDIR}/../less/Makefile.common" .include <bsd.prog.mk> diff --git a/usr.bin/locate/bigram/Makefile b/usr.bin/locate/bigram/Makefile index 57e5bcf..eb39dd1 100644 --- a/usr.bin/locate/bigram/Makefile +++ b/usr.bin/locate/bigram/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= locate.bigram -NOMAN= +NO_MAN= BINDIR= ${LIBEXECDIR} CFLAGS+= -I${.CURDIR}/../locate diff --git a/usr.bin/locate/code/Makefile b/usr.bin/locate/code/Makefile index cc7033b..20eef8c 100644 --- a/usr.bin/locate/code/Makefile +++ b/usr.bin/locate/code/Makefile @@ -3,7 +3,7 @@ PROG= locate.code CFLAGS+=-I${.CURDIR}/../locate -NOMAN= +NO_MAN= BINDIR= ${LIBEXECDIR} .include <bsd.prog.mk> diff --git a/usr.bin/ministat/Makefile b/usr.bin/ministat/Makefile index 547e4bc..62de6a0 100644 --- a/usr.bin/ministat/Makefile +++ b/usr.bin/ministat/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ PROG= ministat -NOMAN= +NO_MAN= DPADD= ${LIBM} LDADD= -lm diff --git a/usr.bin/unexpand/Makefile b/usr.bin/unexpand/Makefile index bdd4a02..14014fa 100644 --- a/usr.bin/unexpand/Makefile +++ b/usr.bin/unexpand/Makefile @@ -2,6 +2,6 @@ # $FreeBSD$ PROG= unexpand -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile index b44773d..37005f3 100644 --- a/usr.bin/uudecode/Makefile +++ b/usr.bin/uudecode/Makefile @@ -4,6 +4,6 @@ PROG= uudecode WARNS?= 4 LINKS= ${BINDIR}/uudecode ${BINDIR}/b64decode -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/usr.bin/vgrind/RETEST/Makefile b/usr.bin/vgrind/RETEST/Makefile index f5c5c82..8712ebb 100644 --- a/usr.bin/vgrind/RETEST/Makefile +++ b/usr.bin/vgrind/RETEST/Makefile @@ -4,7 +4,7 @@ PROG= retest SRCS= regexp.c retest.c .PATH: ${.CURDIR}/.. -NOMAN= +NO_MAN= install: diff --git a/usr.bin/xlint/lint2/Makefile b/usr.bin/xlint/lint2/Makefile index 63c518f..eaee124 100644 --- a/usr.bin/xlint/lint2/Makefile +++ b/usr.bin/xlint/lint2/Makefile @@ -5,7 +5,7 @@ PROG= lint2 SRCS= main2.c hash.c read.c mem.c mem2.c chk.c msg.c emit.c emit2.c inittyp.c -NOMAN= +NO_MAN= CFLAGS+=-I${.CURDIR}/../lint1 LINTFLAGS=-abehrz diff --git a/usr.sbin/bluetooth/bthidd/Makefile b/usr.sbin/bluetooth/bthidd/Makefile index 9183d6d..a60a4e9 100644 --- a/usr.sbin/bluetooth/bthidd/Makefile +++ b/usr.sbin/bluetooth/bthidd/Makefile @@ -3,7 +3,7 @@ PROG= bthidd #MAN= bthidd.8 bthidd.conf.5 -NOMAN= 1 +NO_MAN= 1 SRCS= bthidd.c client.c hid.c kbd.c lexer.l parser.y server.c \ session.c diff --git a/usr.sbin/bootparamd/callbootd/Makefile b/usr.sbin/bootparamd/callbootd/Makefile index d6afade..3c0d314 100644 --- a/usr.sbin/bootparamd/callbootd/Makefile +++ b/usr.sbin/bootparamd/callbootd/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= callbootd -NOMAN= +NO_MAN= SRCS= callbootd.c ${GENSRCS} GENSRCS=bootparam_prot.h bootparam_prot_clnt.c bootparam_prot_xdr.c diff --git a/usr.sbin/crunch/examples/Makefile b/usr.sbin/crunch/examples/Makefile index 282dbc7..6dd49ac 100644 --- a/usr.sbin/crunch/examples/Makefile +++ b/usr.sbin/crunch/examples/Makefile @@ -11,7 +11,7 @@ CONF= $(CRUNCHED).conf OUTMK= $(CRUNCHED).mk OUTPUTS= $(OUTMK) $(CRUNCHED).c $(CRUNCHED).cache -NOMAN= +NO_MAN= CLEANFILES+= $(CRUNCHED) *.o *.lo *.c *.mk *.cache CLEANDIRFILES+= $(OUTPUTS) diff --git a/usr.sbin/ctm/ctm_dequeue/Makefile b/usr.sbin/ctm/ctm_dequeue/Makefile index da88ca6..07a234f 100644 --- a/usr.sbin/ctm/ctm_dequeue/Makefile +++ b/usr.sbin/ctm/ctm_dequeue/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../ctm_rmail PROG= ctm_dequeue -NOMAN= +NO_MAN= SRCS= ctm_dequeue.c error.c CFLAGS+= -I${.CURDIR}/../ctm_rmail diff --git a/usr.sbin/ctm/ctm_smail/Makefile b/usr.sbin/ctm/ctm_smail/Makefile index 226799d..980e9bf 100644 --- a/usr.sbin/ctm/ctm_smail/Makefile +++ b/usr.sbin/ctm/ctm_smail/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../ctm_rmail PROG= ctm_smail -NOMAN= +NO_MAN= SRCS= ctm_smail.c error.c CFLAGS+= -I${.CURDIR}/../ctm_rmail diff --git a/usr.sbin/ctm/mkCTM/Makefile b/usr.sbin/ctm/mkCTM/Makefile index 98c3c94..a5c9cde 100644 --- a/usr.sbin/ctm/mkCTM/Makefile +++ b/usr.sbin/ctm/mkCTM/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= mkctm -NOMAN= +NO_MAN= SRCS= mkctm.c DPADD= ${LIBMD} diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile b/usr.sbin/lpr/filters.ru/koi2855/Makefile index 7689628..361783e 100644 --- a/usr.sbin/lpr/filters.ru/koi2855/Makefile +++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= koi2855 -NOMAN= +NO_MAN= CFLAGS+= -I${.CURDIR}/../../common_source diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile b/usr.sbin/lpr/filters.ru/koi2alt/Makefile index 8aeff47..e410d9a 100644 --- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile +++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= koi2alt -NOMAN= +NO_MAN= CFLAGS+= -I${.CURDIR}/../../common_source diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile index c4df585..b55b536 100644 --- a/usr.sbin/lpr/filters/Makefile +++ b/usr.sbin/lpr/filters/Makefile @@ -4,7 +4,7 @@ BINDIR= /usr/libexec/lpr PROG= lpf -NOMAN= +NO_MAN= CFLAGS+= -I${.CURDIR}/../common_source diff --git a/usr.sbin/mrouted/testrsrr/Makefile b/usr.sbin/mrouted/testrsrr/Makefile index 87c80e2..a2164fb 100644 --- a/usr.sbin/mrouted/testrsrr/Makefile +++ b/usr.sbin/mrouted/testrsrr/Makefile @@ -4,7 +4,7 @@ S= ${.CURDIR}/.. .PATH: $S PROG= testrsrr -NOMAN= +NO_MAN= SRCS= testrsrr.c CFLAGS+= -I$S diff --git a/usr.sbin/ntp/Makefile b/usr.sbin/ntp/Makefile index 71d1309..3ed705a 100644 --- a/usr.sbin/ntp/Makefile +++ b/usr.sbin/ntp/Makefile @@ -4,7 +4,7 @@ SUBDIR= libntp libparse ntpd ntpdc ntpq ntpdate ntptrace \ ntptime ntp-keygen sntp -.if !defined(NOMAN) +.if !defined(NO_MAN) SUBDIR+= doc .endif diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile index 953bf21..540c851 100644 --- a/usr.sbin/ntp/ntp-keygen/Makefile +++ b/usr.sbin/ntp/ntp-keygen/Makefile @@ -4,7 +4,7 @@ ${.CURDIR}/../../../contrib/ntp/ntpd PROG= ntp-keygen -NOMAN= +NO_MAN= SRCS= ntp-keygen.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile index 98889b2..c906583 100644 --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/ntpd PROG= ntpd -NOMAN= +NO_MAN= SRCS= cmd_args.c map_vme.c ntp_config.c \ ntp_control.c ntp_crypto.c ntp_filegen.c \ ntp_intres.c ntp_io.c ntp_loopfilter.c \ diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile index 1941939..a72f550 100644 --- a/usr.sbin/ntp/ntpdate/Makefile +++ b/usr.sbin/ntp/ntpdate/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate PROG= ntpdate -NOMAN= +NO_MAN= SRCS= ntpdate.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile index 1436645..730308c 100644 --- a/usr.sbin/ntp/ntpdc/Makefile +++ b/usr.sbin/ntp/ntpdc/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/ntpdc PROG= ntpdc -NOMAN= +NO_MAN= SRCS= ntpdc.c ntpdc_ops.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile index 2b3a14c..613e02e 100644 --- a/usr.sbin/ntp/ntpq/Makefile +++ b/usr.sbin/ntp/ntpq/Makefile @@ -5,7 +5,7 @@ BINDIR= /usr/bin PROG= ntpq -NOMAN= +NO_MAN= SRCS= ntpq.c ntpq_ops.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ diff --git a/usr.sbin/ntp/ntptime/Makefile b/usr.sbin/ntp/ntptime/Makefile index 8132626..9f47176 100644 --- a/usr.sbin/ntp/ntptime/Makefile +++ b/usr.sbin/ntp/ntptime/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/util PROG= ntptime -NOMAN= +NO_MAN= SRCS= ntptime.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ diff --git a/usr.sbin/ntp/ntptrace/Makefile b/usr.sbin/ntp/ntptrace/Makefile index b0c26a8..3701490 100644 --- a/usr.sbin/ntp/ntptrace/Makefile +++ b/usr.sbin/ntp/ntptrace/Makefile @@ -5,6 +5,6 @@ SCRIPTS= ntptrace SCRIPTSNAME= ntptrace -NOMAN= +NO_MAN= .include <bsd.prog.mk> diff --git a/usr.sbin/ntp/sntp/Makefile b/usr.sbin/ntp/sntp/Makefile index 33f9871..f7a9eb9 100644 --- a/usr.sbin/ntp/sntp/Makefile +++ b/usr.sbin/ntp/sntp/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/sntp PROG= sntp -NOMAN= +NO_MAN= SRCS= internet.c main.c socket.c timing.c unix.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ diff --git a/usr.sbin/pcvt/Misc/Doc/Makefile b/usr.sbin/pcvt/Misc/Doc/Makefile index 2db21c74..11f540d 100644 --- a/usr.sbin/pcvt/Misc/Doc/Makefile +++ b/usr.sbin/pcvt/Misc/Doc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= +NO_OBJ= FILES= Acknowledgements Bibliography CharGen \ Charsets EscapeSequences Keyboard.HP Keyboard.VT \ NotesAndHints diff --git a/usr.sbin/pcvt/Misc/Etc/Makefile b/usr.sbin/pcvt/Misc/Etc/Makefile index 83b780d..0225202 100644 --- a/usr.sbin/pcvt/Misc/Etc/Makefile +++ b/usr.sbin/pcvt/Misc/Etc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= +NO_OBJ= FILES= Termcap Terminfo pcvt.el xmodmap-german pcvt.sh FILESDIR= ${BINDIR}/Etc diff --git a/usr.sbin/pcvt/Misc/Makefile b/usr.sbin/pcvt/Misc/Makefile index 96c87ab..442c704 100644 --- a/usr.sbin/pcvt/Misc/Makefile +++ b/usr.sbin/pcvt/Misc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= +NO_OBJ= FILES= README.FIRST SUBDIR= Doc Etc diff --git a/usr.sbin/pcvt/demo/Makefile b/usr.sbin/pcvt/demo/Makefile index e5cf468..e3ccde3 100644 --- a/usr.sbin/pcvt/demo/Makefile +++ b/usr.sbin/pcvt/demo/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= playvt -NOMAN= +NO_MAN= SRCS= playvt.c DEMOS= chardemo.vt colors.vt sgr.vt diff --git a/usr.sbin/pcvt/kbdio/Makefile b/usr.sbin/pcvt/kbdio/Makefile index 1f8dd54..e4359c8 100644 --- a/usr.sbin/pcvt/kbdio/Makefile +++ b/usr.sbin/pcvt/kbdio/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= kbdio -NOMAN= +NO_MAN= SRCS= kbdio.y lex.l y.tab.h CFLAGS+= -I${.OBJDIR} -I${.CURDIR} #-g diff --git a/usr.sbin/rpc.ypupdated/Makefile b/usr.sbin/rpc.ypupdated/Makefile index fc7ea01..4fe19c9 100644 --- a/usr.sbin/rpc.ypupdated/Makefile +++ b/usr.sbin/rpc.ypupdated/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../ypserv ${.CURDIR}/../../libexec/ypxfr PROG= rpc.ypupdated -NOMAN= +NO_MAN= SRCS= ypupdate_prot_svc.c ypupdate_prot.h ypupdated_main.c \ yp_error.c update.c ypupdated_server.c \ yp_dblookup.c yp_dbwrite.c yp_dbdelete.c yp_dbupdate.c diff --git a/usr.sbin/vnconfig/Makefile b/usr.sbin/vnconfig/Makefile index 7ba006e..7bf6990 100644 --- a/usr.sbin/vnconfig/Makefile +++ b/usr.sbin/vnconfig/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ PROG= vnconfig -NOMAN= # mdconfig supplies manpage +NO_MAN= # mdconfig supplies manpage .include <bsd.prog.mk> |
