Now that we're way past our conversion from GNU awk to BWK awk, we don't

need to primarily install as a non-conflicting name.

usr.bin/awk/Makefile

@@ -3,7 +3,7 @@
 AWKSRC=	${.CURDIR}/../../contrib/one-true-awk
 .PATH: ${AWKSRC}
 
-PROG=	nawk
+PROG=	awk
 SRCS=	awkgram.y b.c lex.c lib.c main.c parse.c proctab.c run.c tran.c ytab.h
 
 CFLAGS+= -DHAS_ISBLANK -I. -I${AWKSRC}
@@ -11,8 +11,8 @@ CFLAGS+= -DHAS_ISBLANK -I. -I${AWKSRC}
 DPADD=	${LIBM}
 LDADD=	-lm
 
-LINKS=	${BINDIR}/nawk ${BINDIR}/awk
-MLINKS=	nawk.1 awk.1
+LINKS=	${BINDIR}/awk ${BINDIR}/nawk
+MLINKS=	awk.1 nawk.1
 
 CLEANFILES= maketab proctab.c ytab.h
 
@@ -25,10 +25,6 @@ proctab.c: maketab
 build-tools: maketab
 maketab: ytab.h ${AWKSRC}/maketab.c
 
-CLEANFILES+=	nawk.1
-nawk.1: awk.1
-	cat ${.ALLSRC} > ${.TARGET}
-
 .for f in b.c main.c run.c
 ${f}: ${AWKSRC}/${f} ${.CURDIR}/${f}.diff
 	patch -s -b .orig -o ${.TARGET} < ${.CURDIR}/${f}.diff ${AWKSRC}/${f}