5 files changed, 11 insertions, 11 deletions

diff --git a/gnu/Makefile.inc b/gnu/Makefile.inc
index b1acfb93f874..5de8a1ece6f8 100644
--- a/gnu/Makefile.inc
+++ b/gnu/Makefile.inc
@@ -3,4 +3,4 @@
 # Do not lint the GNU stuff. It is all externally maintained and
 # lint output is wasteful noise here.
 
-NOLINT=
+NO_LINT=
diff --git a/gnu/lib/libg2c/Makefile b/gnu/lib/libg2c/Makefile
index dc71a21102d8..49a4ca646c77 100644
--- a/gnu/lib/libg2c/Makefile
+++ b/gnu/lib/libg2c/Makefile
@@ -99,13 +99,13 @@ Version${x}.c: ${SRCDIR}/lib${x}77/Version.c
 ${E77OBJS}: f2cext.c
 	${CC} ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 
-.if !defined(NOPIC)
+.if !defined(NO_PIC)
 ${E77OBJS:.o=.So}: f2cext.c
 	${CC} ${PICFLAG} -DPIC ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} \
 	    ${.ALLSRC:M*.c}
 .endif
 
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
 ${E77OBJS:.o=.po}: f2cext.c
 	${CC} -p ${CFLAGS} -c -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 .endif
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
index a40848856816..6eb28b8ec1c0 100644
--- a/gnu/lib/libgcc/Makefile
+++ b/gnu/lib/libgcc/Makefile
@@ -192,12 +192,12 @@ ${OBJS} beforedepend: ${COMMONHDRS}
 ${OBJS_T}: libgcc2.c
 	${XCC} -c ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 
-.if !defined(NOPIC)
+.if !defined(NO_PIC)
 ${OBJS_S}: libgcc2.c
 	${XCC} -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 .endif
 
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
 ${OBJS_P}: libgcc2.c
 	${XCC} -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 .endif
@@ -208,13 +208,13 @@ ${ASM_T}: ${_lib1asmsrc}
 	${XCC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} \
 	    -o ${.TARGET} ${.ALLSRC:N*.h}
 
-.if !defined(NOPIC)
+.if !defined(NO_PIC)
 ${ASM_S}: ${_lib1asmsrc}
 	${XCC} -x assembler-with-cpp -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} \
 	    -o ${.TARGET} ${.ALLSRC:N*.h}
 .endif
 
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
 ${ASM_P}: ${_lib1asmsrc}
 	${XCC} -x assembler-with-cpp -p -c ${CFLAGS} -DL${.PREFIX} \
 	    -o ${.TARGET} ${.ALLSRC:N*.h}
diff --git a/gnu/lib/libgcov/Makefile b/gnu/lib/libgcov/Makefile
index c44741302167..bcf4d2d3e6e7 100644
--- a/gnu/lib/libgcov/Makefile
+++ b/gnu/lib/libgcov/Makefile
@@ -6,7 +6,7 @@ GCCDIR=	${.CURDIR}/../../../contrib/gcc
 .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR}
 
 LIB=		gcov
-NOPROFILE=
+NO_PROFILE=
 
 CFLAGS+=	-DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED
 CFLAGS+=	-D_PTHREADS -DGTHREAD_USE_WEAK
@@ -32,12 +32,12 @@ ${OBJS} beforedepend: ${COMMONHDRS}
 ${OBJS_T}: libgcov.c
 	${CC} -c ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 
-.if !defined(NOPIC)
+.if !defined(NO_PIC)
 ${OBJS_S}: libgcov.c
 	${CC} -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 .endif
 
-.if !defined(NOPROFILE)
+.if !defined(NO_PROFILE)
 ${OBJS_P}: libgcc2.c
 	${CC} -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c}
 .endif
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile
index 4d10ae0bdeb5..dd67f2c95e06 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -11,7 +11,7 @@ NO_MAN=
 SHLIB_MAJOR= 1
 .else
 # XXX is this still correct?
-NOPIC=	# works but method lookup slowdown is significant
+NO_PIC=	# works but method lookup slowdown is significant
 .endif
 
 SRCS=   archive.c class.c encoding.c gc.c hash.c init.c misc.c \