34 files changed, 34 insertions, 33 deletions

diff --git a/Makefile b/Makefile
index 5302d0122c7ad..c3ebfdb7f31be 100644
--- a/Makefile
+++ b/Makefile
@@ -232,7 +232,7 @@ MMAKEENV=	MAKEOBJDIRPREFIX=${MAKEPATH} \
 		INSTALL="sh ${.CURDIR}/tools/install.sh"
 MMAKE=		${MMAKEENV} make \
 		-D_UPGRADING \
-		-DNOMAN -DNO_MAN -DNOSHARED \
+		-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
 		-DNO_CPU_CFLAGS -DNO_WERROR
 
 make: .PHONY
diff --git a/Makefile.inc1 b/Makefile.inc1
index 9d3f179a24f67..6d1ddeb22dd3f 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -183,7 +183,7 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		-DNOHTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_PIC -DNO_PROFILE \
-		-DNOSHARED -DNO_CPU_CFLAGS -DNO_WARNS
+		-DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS
 
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index 108488faf84ee..b1f1612afddbb 100644
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -5,5 +5,5 @@ BINDIR?=	/bin
 WARNS?=		6
 
 .if defined(NO_DYNAMICROOT)
-NOSHARED?=	YES
+NO_SHARED?=	YES
 .endif
diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile
index f76781b848ec4..d2ea1fad25f54 100644
--- a/bin/rmail/Makefile
+++ b/bin/rmail/Makefile
@@ -5,7 +5,7 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/rmail
 
 # Not much point this being static. It calls a shared sendmail...
-NOSHARED?= NO
+NO_SHARED?= NO
 
 PROG=	rmail
 SRCS=	rmail.c
diff --git a/gnu/usr.bin/binutils/ar/Makefile b/gnu/usr.bin/binutils/ar/Makefile
index 0d4f20ce56fe8..59031869a25a9 100644
--- a/gnu/usr.bin/binutils/ar/Makefile
+++ b/gnu/usr.bin/binutils/ar/Makefile
@@ -10,7 +10,7 @@ CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -I${SRCDIR}/bfd
-NOSHARED?= yes
+NO_SHARED?= yes
 DPADD=	${RELTOP}/libbinutils/libbinutils.a
 DPADD+=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile
index eccfd4d354c56..9bf4880faf2df 100644
--- a/gnu/usr.bin/binutils/as/Makefile
+++ b/gnu/usr.bin/binutils/as/Makefile
@@ -43,7 +43,7 @@ CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${SRCDIR}/gas -I${SRCDIR}/gas/config -I${SRCDIR}
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${TARGET_ARCH}-freebsd
 
-NOSHARED?=	yes
+NO_SHARED?=	yes
 
 DPADD=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile
index 435f72b48c96e..ecf8cce33ed9e 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile
+++ b/gnu/usr.bin/binutils/gdb/Makefile
@@ -16,7 +16,7 @@ GDB_CPU=	i386
 GDB_CPU=	${TARGET_ARCH}
 .endif
 
-NOSHARED?=yes
+NO_SHARED?=yes
 PROG=	gdb
 XSRCS=	annotate.c arch-utils.c ax-general.c ax-gdb.c bcache.c		\
 	blockframe.c breakpoint.c buildsym.c complaints.c completer.c	\
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index 00fba272c7b53..66e8e2ab9035e 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -19,7 +19,7 @@ CFLAGS+= -DBINDIR=\"${BINDIR}\" -DTARGET_SYSTEM_ROOT=\"${TOOLS_PREFIX}\"
 CFLAGS+= -DTOOLBINDIR=\"${TOOLS_PREFIX}/${BINDIR}/libexec\"
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd
-NOSHARED?= yes
+NO_SHARED?= yes
 DPADD=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
diff --git a/gnu/usr.bin/binutils/ranlib/Makefile b/gnu/usr.bin/binutils/ranlib/Makefile
index ddbf3f2009308..8edfa01bb13bb 100644
--- a/gnu/usr.bin/binutils/ranlib/Makefile
+++ b/gnu/usr.bin/binutils/ranlib/Makefile
@@ -10,7 +10,7 @@ CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -I${SRCDIR}/bfd
-NOSHARED?= yes
+NO_SHARED?= yes
 DPADD=	${RELTOP}/libbinutils/libbinutils.a
 DPADD+=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index 0df2e6ee527b8..ae8745bbc550d 100644
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -8,7 +8,7 @@
 PROG=	cc
 MAN=	gcc.1
 SRCS=	gcc.c gccspec.c
-NOSHARED?=yes
+NO_SHARED?=yes
 
 LINKS=	${BINDIR}/cc ${BINDIR}/gcc
 MLINKS=	gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index da4ad477a1347..b05ad1ef93373 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -8,7 +8,7 @@ PROG=	cc1
 SRCS=	main.c c-parse+%DIKED.c c-lang.c stub-objc.c
 BINDIR=	/usr/libexec
 NO_MAN=
-NOSHARED?=yes
+NO_SHARED?=yes
 
 CFLAGS+= -I.
 
diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
index 94d7a61ad55cc..075e7576cd0ee 100644
--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ b/gnu/usr.bin/cc/cc1obj/Makefile
@@ -8,7 +8,7 @@ PROG=	cc1obj
 SRCS=	main.c objc-parse+DIKED.c objc-act.c objc-lang.c c-decl.c
 BINDIR=	/usr/libexec
 NO_MAN=
-NOSHARED?=yes
+NO_SHARED?=yes
 
 CFLAGS+= -I${GCCDIR}/objc -I.
 
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 8bc910e9ec880..4ba5d668c51d8 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -13,7 +13,7 @@ SRCS+=	main.c cp-lang.c c-opts.c call.c class.c cvt.c cxx-pretty-print.c \
 
 BINDIR=	/usr/libexec
 NO_MAN=
-NOSHARED?=yes
+NO_SHARED?=yes
 
 CFLAGS+= -I${GCCDIR}/cp -I.
 
diff --git a/release/Makefile b/release/Makefile
index da9ef817dc007..b33d8ed9a01cf 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -472,7 +472,7 @@ release rerelease:
 	NOCDROM \
 	NODOC \
 	NOPORTS \
-	NOSHARED \
+	NO_SHARED \
 	NOSRC \
 	NO_CPU_CFLAGS \
 	NO_CPU_COPTFLAGS \
diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc
index 7a1ebd0745445..d1fed2690a19d 100644
--- a/sbin/Makefile.inc
+++ b/sbin/Makefile.inc
@@ -5,5 +5,5 @@ BINDIR?=	/sbin
 WARNS?=	2
 
 .if defined(NO_DYNAMICROOT)
-NOSHARED?=	YES
+NO_SHARED?=	YES
 .endif
diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile
index 8e1122eaf3cbb..469e1e247b974 100644
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -5,7 +5,7 @@ SRCS=	devd.cc token.l parse.y y.tab.h
 MAN=	devd.8 devd.conf.5
 WARNS?=	1
 
-NOSHARED?=YES
+NO_SHARED?=YES
 
 DPADD=	${LIBL}
 LDADD=	-ll
diff --git a/sbin/geom/core/Makefile b/sbin/geom/core/Makefile
index 13c6a09e24fdb..d76c35b0512dc 100644
--- a/sbin/geom/core/Makefile
+++ b/sbin/geom/core/Makefile
@@ -6,7 +6,7 @@ PROG=	geom
 MAN=	geom.8
 SRCS=	geom.c subr.c
 
-NOSHARED=NO
+NO_SHARED=NO
 
 CFLAGS+= -DCLASS_DIR=\"${CLASS_DIR}\"
 CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/..
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index 61752e9d32770..d3e9e963bf087 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -12,6 +12,6 @@ WARNS?=	0
 DPADD=	${LIBUTIL} ${LIBCRYPT}
 LDADD=	-lutil -lcrypt
 
-NOSHARED?=	YES
+NO_SHARED?=	YES
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_cd9660/Makefile b/sbin/mount_cd9660/Makefile
index 80af58a5f19c1..044985cecc873 100644
--- a/sbin/mount_cd9660/Makefile
+++ b/sbin/mount_cd9660/Makefile
@@ -13,7 +13,7 @@ WARNS?=	0
 
 # Needs to be dynamically linked for optional dlopen() access to
 # userland libiconv
-NOSHARED?=	NO
+NO_SHARED?=	NO
 
 .PATH:	${MOUNT}
 
diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile
index 7fedb6818fab0..273ac01037c02 100644
--- a/sbin/mount_msdosfs/Makefile
+++ b/sbin/mount_msdosfs/Makefile
@@ -14,7 +14,7 @@ WARNS?=	2
 
 # Needs to be dynamically linked for optional dlopen() access to
 # userland libiconv
-NOSHARED?=	NO
+NO_SHARED?=	NO
 
 .PATH:	${MOUNT}
 
diff --git a/sbin/mount_ntfs/Makefile b/sbin/mount_ntfs/Makefile
index 8a3e75e08bb28..5938b0dd52a6d 100644
--- a/sbin/mount_ntfs/Makefile
+++ b/sbin/mount_ntfs/Makefile
@@ -14,7 +14,7 @@ WARNS?=	0
 
 # Needs to be dynamically linked for optional dlopen() access to
 # userland libiconv
-NOSHARED?=	NO
+NO_SHARED?=	NO
 
 .PATH:	${MOUNT}
 
diff --git a/sbin/mount_udf/Makefile b/sbin/mount_udf/Makefile
index 3096c8e04566e..e83328a2f9f50 100644
--- a/sbin/mount_udf/Makefile
+++ b/sbin/mount_udf/Makefile
@@ -13,6 +13,6 @@ WARNS?= 1
 
 # Needs to be dynamically linked for optional dlopen() access to
 # userland libiconv
-NOSHARED?=	NO
+NO_SHARED?=	NO
 
 .include <bsd.prog.mk>
diff --git a/sbin/mount_ufs/Makefile b/sbin/mount_ufs/Makefile
index 2c35d2024a680..f7d331defca47 100644
--- a/sbin/mount_ufs/Makefile
+++ b/sbin/mount_ufs/Makefile
@@ -11,6 +11,6 @@ WARNS?= 1
 
 # Needs to be dynamically linked for optional dlopen() access to
 # userland libiconv
-NOSHARED?=	NO
+NO_SHARED?=	NO
 
 .include <bsd.prog.mk>
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 05be9d176e72a..1347c87b83b48 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -138,7 +138,7 @@
 #NO_PROFILE=		# Avoid compiling profiled libraries
 #NO_SENDMAIL=		# do not build sendmail and related programs
 #NOSHARE=		# do not go into the share subdir
-#NOSHARED= 		# build /bin and /sbin dynamically linked (bad idea
+#NO_SHARED= 		# build /bin and /sbin dynamically linked (bad idea
 #NO_SHAREDOCS=		# do not build the 4.4BSD legacy docs
 #NO_TCSH=		# do not build and install /bin/csh (which is tcsh)
 #NO_TOOLCHAIN=		# do not build programs for program development
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 7f50fd8168908..ca57277a3daaf 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -575,7 +575,7 @@ Set to avoid compiling profiled libraries.
 Set to not build in the
 .Pa share
 subdir.
-.It Va NOSHARED
+.It Va NO_SHARED
 .Pq Vt bool
 Set to not build
 .Pa /bin
diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk
index 7b245052f63c9..fb4c7e95f3c96 100644
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@@ -19,6 +19,7 @@
 	NOOBJ:NO_OBJ \
 	NOPIC:NO_PIC \
 	NOPROFILE:NO_PROFILE \
+	NOSHARED:NO_SHARED \
 	NOTAGS:NO_TAGS
 .for old in ${oldnew:C/:.*//}
 .for new in ${oldnew:C/.*://}
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 6c5d7c1eed4da..15e86e9618bd7 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -22,7 +22,7 @@ CFLAGS+=${CRUNCH_CFLAGS}
 STRIP?=	-s
 .endif
 
-.if defined(NOSHARED) && (${NOSHARED} != "no" && ${NOSHARED} != "NO")
+.if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
 LDFLAGS+= -static
 .endif
 
diff --git a/sys/boot/i386/kgzldr/Makefile b/sys/boot/i386/kgzldr/Makefile
index eb098a2a7f953..a124474da4e5f 100644
--- a/sys/boot/i386/kgzldr/Makefile
+++ b/sys/boot/i386/kgzldr/Makefile
@@ -9,7 +9,7 @@ NO_MAN=
 SRCS=	start.s boot.c inflate.c lib.c crt.s sio.s
 CFLAGS=	-Os
 CFLAGS+=-DKZIP
-NOSHARED=
+NO_SHARED=
 LDFLAGS=-Wl,-r
 .PATH:	${.CURDIR}/../../../kern
 
diff --git a/sys/boot/pc98/boot2/Makefile b/sys/boot/pc98/boot2/Makefile
index b6f3c9172fa3f..de7e867a24deb 100644
--- a/sys/boot/pc98/boot2/Makefile
+++ b/sys/boot/pc98/boot2/Makefile
@@ -49,7 +49,7 @@ CFLAGS+=	-DCOMSPEED=${BOOT_COMCONSOLE_SPEED}
 
 CLEANFILES+=	boot.nohdr boot.strip boot.ldr boot1 boot2 sizetest
 LDFLAGS+=	-N -Ttext 0 -e start
-NOSHARED=	YES
+NO_SHARED=	YES
 NO_MAN=
 STRIP=
 
diff --git a/sys/boot/pc98/kgzldr/Makefile b/sys/boot/pc98/kgzldr/Makefile
index ca41781cbf00b..e90a0b3c661b6 100644
--- a/sys/boot/pc98/kgzldr/Makefile
+++ b/sys/boot/pc98/kgzldr/Makefile
@@ -9,7 +9,7 @@ NO_MAN=
 SRCS=	start.s boot.c inflate.c lib.c crt.s sio.s
 CFLAGS=	-Os
 CFLAGS+=-DKZIP
-NOSHARED=
+NO_SHARED=
 LDFLAGS=-Wl,-r
 .PATH:	${.CURDIR}/../../../kern
 .PATH:	${.CURDIR}/../../i386/kgzldr
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 953bb3e93fea7..e45f6da534528 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -12,7 +12,7 @@ SRCS+=	lstAppend.c lstConcat.c lstDeQueue.c lstDestroy.c \
 .PATH:	${.CURDIR}/lst.lib
 
 WARNS?=	3
-NOSHARED?=	YES
+NO_SHARED?=	YES
 
 CFLAGS+=-DMAKE_VERSION=\"5200408120\"
 .if defined(_UPGRADING)
diff --git a/usr.sbin/mount_smbfs/Makefile b/usr.sbin/mount_smbfs/Makefile
index 91be9b99b01be..9bbe0a4e7b4e7 100644
--- a/usr.sbin/mount_smbfs/Makefile
+++ b/usr.sbin/mount_smbfs/Makefile
@@ -15,7 +15,7 @@ DPADD=	${LIBSMB}
 # Needs to be dynamically linked for optional dlopen() access to
 # userland libiconv (see the -E option).
 #
-NOSHARED?=	NO
+NO_SHARED?=	NO
 
 .PATH:	${CONTRIBDIR}/mount_smbfs
 
diff --git a/usr.sbin/nologin/Makefile b/usr.sbin/nologin/Makefile
index 48efba2956ace..0b4c0db25d1c1 100644
--- a/usr.sbin/nologin/Makefile
+++ b/usr.sbin/nologin/Makefile
@@ -11,6 +11,6 @@ SYMLINKS=	${BINDIR}/nologin /sbin/nologin
 # libc by setting LD_LIBRARY_PATH appropriately.  Both sshd(8) and
 # login(1) make it possible to log in with an unsanitized environment,
 # rendering a dynamic nologin binary virtually useless.
-NOSHARED=	YES
+NO_SHARED=	YES
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pccard/Makefile.inc b/usr.sbin/pccard/Makefile.inc
index 88fdf2cf5eb29..cd8896df860c0 100644
--- a/usr.sbin/pccard/Makefile.inc
+++ b/usr.sbin/pccard/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-NOSHARED?=	YES
+NO_SHARED?=	YES
 
 .include "../Makefile.inc"