summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>2002-03-19 06:11:43 +0000
committerbde <bde@FreeBSD.org>2002-03-19 06:11:43 +0000
commitc900f7bd6fb6ff230c7c7f0120909bcbc1c7c6f7 (patch)
tree08fc91b04e0b59053726e87e739ced289957a25d /share
parent3b8cb9e7120b4618e61a1573cdaf595c1c617a26 (diff)
downloadFreeBSD-src-c900f7bd6fb6ff230c7c7f0120909bcbc1c7c6f7.zip
FreeBSD-src-c900f7bd6fb6ff230c7c7f0120909bcbc1c7c6f7.tar.gz
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).
Diffstat (limited to 'share')
-rw-r--r--share/mk/bsd.dep.mk2
-rw-r--r--share/mk/bsd.info.mk8
2 files changed, 5 insertions, 5 deletions
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index 09fb2c9..1d0e34b 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 9cbcac9..f02749d 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
OpenPOWER on IntegriCloud