From afabc4dfc25400b36a7f66a83ad7208bb20f53fd Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Tue, 19 Mar 2002 06:11:43 +0000
Subject: [PATCH] Removed bogus env(1) commands.  make(1) uses a real shell, so
 "env name=value ... cmd ..." was just a pessimized way of doing "name=value
 ... cmd ...".  Note that make(1) can't optimize either of these to an exec of
 env(1) or "cmd" even if the second "..." is simple, since it can't tell that
 the shell metacharacter in "name=value" is actually handled by env(1).

---
 share/mk/bsd.dep.mk  | 2 +-
 share/mk/bsd.info.mk | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index 09fb2c98d271..1d0e34b54970 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -28,7 +28,7 @@
 #		If HTML is defined, htags is also run after gtags.
 
 
-MKDEPCMD?=	env CC=${CC} mkdep
+MKDEPCMD?=	CC=${CC} mkdep
 DEPENDFILE?=	.depend
 
 .if defined(SRCS)
diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk
index 9cbcac987380..f02749da3762 100644
--- a/share/mk/bsd.info.mk
+++ b/share/mk/bsd.info.mk
@@ -109,18 +109,18 @@ DVIPS2ASCII?=	dvips2ascii
 		-o ${.TARGET}
 
 .texi.dvi .texinfo.dvi:
-	env TEXINPUTS=${.CURDIR}:${SRCDIR}:$$TEXINPUTS \
+	TEXINPUTS=${.CURDIR}:${SRCDIR}:$$TEXINPUTS \
 		${TEX} ${.IMPSRC} </dev/null
 # Run again to reolve cross references.
-	env TEXINPUTS=${.CURDIR}:${SRCDIR}:$$TEXINPUTS \
+	TEXINPUTS=${.CURDIR}:${SRCDIR}:$$TEXINPUTS \
 		${TEX} ${.IMPSRC} </dev/null
 
 .texinfo.latin1 .texi.latin1:
 	perl -npe 's/(^\s*\\input\s+texinfo\s+)/$$1\n@tex\n\\global\\hsize=120mm\n@end tex\n\n/' ${.IMPSRC} >> ${.IMPSRC:T:R}-la.texi
-	env TEXINPUTS=${.CURDIR}:${SRCDIR}:$$TEXINPUTS \
+	TEXINPUTS=${.CURDIR}:${SRCDIR}:$$TEXINPUTS \
 		${TEX} ${.IMPSRC:T:R}-la.texi </dev/null
 # Run again to reolve cross references.
-	env TEXINPUTS=${.CURDIR}:${SRCDIR}:$$TEXINPUTS \
+	TEXINPUTS=${.CURDIR}:${SRCDIR}:$$TEXINPUTS \
 		${TEX} ${.IMPSRC:T:R}-la.texi </dev/null
 	${DVIPS} -o /dev/stdout ${.IMPSRC:T:R}-la.dvi | \
 		${DVIPS2ASCII} > ${.TARGET}.new