Merge remote-tracking branch 'origin/stable/11' into devel-11

1 files changed, 3 insertions, 13 deletions

diff --git a/Makefile.inc1 b/Makefile.inc1
index cfd9076..4a18cb5 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1579,10 +1579,6 @@ _groff=		gnu/usr.bin/groff \
 _vtfontcvt=	usr.bin/vtfontcvt
 .endif
 
-.if ${BOOTSTRAPPING} < 900002
-_sed=		usr.bin/sed
-.endif
-
 .if ${BOOTSTRAPPING} < 1000033
 _libopenbsd=	lib/libopenbsd
 _m4=		usr.bin/m4
@@ -1621,10 +1617,6 @@ _crunchide=	usr.sbin/crunch/crunchide
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
-.if ${BOOTSTRAPPING} >= 900040 && ${BOOTSTRAPPING} < 900041
-_awk=		usr.bin/awk
-.endif
-
 # r296926 -P keymap search path, MFC to stable/10 in r298297
 .if ${BOOTSTRAPPING} < 1003501 || \
 	(${BOOTSTRAPPING} >= 1100000 && ${BOOTSTRAPPING} < 1100103)
@@ -1692,7 +1684,6 @@ bootstrap-tools: .PHONY
     ${_gperf} \
     ${_groff} \
     ${_dtc} \
-    ${_awk} \
     ${_cat} \
     ${_dd} \
     ${_kbdcontrol} \
@@ -1700,7 +1691,6 @@ bootstrap-tools: .PHONY
     ${_libopenbsd} \
     ${_makewhatis} \
     usr.bin/rpcgen \
-    ${_sed} \
     ${_yacc} \
     ${_m4} \
     ${_lex} \
@@ -2372,11 +2362,11 @@ check-old-dirs: .PHONY
 	done
 
 delete-old: delete-old-files delete-old-dirs .PHONY
-	@echo "To remove old libraries run '${MAKE} delete-old-libs'."
+	@echo "To remove old libraries run '${MAKE_CMD} delete-old-libs'."
 
 check-old: check-old-files check-old-libs check-old-dirs .PHONY
-	@echo "To remove old files and directories run '${MAKE} delete-old'."
-	@echo "To remove old libraries run '${MAKE} delete-old-libs'."
+	@echo "To remove old files and directories run '${MAKE_CMD} delete-old'."
+	@echo "To remove old libraries run '${MAKE_CMD} delete-old-libs'."
 
 .endif