Index: branches/2021Q1/shells/v7sh/files/Makefile
===================================================================
--- branches/2021Q1/shells/v7sh/files/Makefile	(revision 564954)
+++ branches/2021Q1/shells/v7sh/files/Makefile	(revision 564955)
@@ -1,21 +1,25 @@
 # $FreeBSD$
 
 PREFIX?=	/usr/local
 BINDIR?=	${PREFIX}/bin
 MANDIR?=	${PREFIX}/man/man
 
 PROG=	v7sh
 SRCS=   args.c blok.c builtin.c cmd.c ctype.c error.c expand.c \
 	fault.c io.c macro.c main.c msg.c name.c print.c service.c \
 	setbrk.c stak.c string.c test.c word.c xec.c
 
 #CFLAGS+=	-DSYSIII
 #CFLAGS+=	-DRENO
 #CFLAGS+=	-DULTRIX
 
 CWARNFLAGS?=	-ansi -Wbad-function-cast
 WARNS?=	6
+.if ${OSREL:R} < 13
 NO_WERROR=1
+.else
+MK_WERROR=no
+.endif
 WFORMAT=0
 
 .include <bsd.prog.mk>
Index: branches/2021Q1
===================================================================
--- branches/2021Q1	(revision 564954)
+++ branches/2021Q1	(revision 564955)

Property changes on: branches/2021Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r564954