Module Name: src
Committed By: christos
Date: Wed May 25 00:14:47 UTC 2016
Modified Files:
src/distrib/sets: mkvars.mk sets.subr
Log Message:
Give up and use TOOL_SED again.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.175 -r1.176 src/distrib/sets/sets.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.27 src/distrib/sets/mkvars.mk:1.28
--- src/distrib/sets/mkvars.mk:1.27 Tue May 24 15:36:41 2016
+++ src/distrib/sets/mkvars.mk Tue May 24 20:14:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mkvars.mk,v 1.27 2016/05/24 19:36:41 christos Exp $
+# $NetBSD: mkvars.mk,v 1.28 2016/05/25 00:14:47 christos Exp $
MKEXTRAVARS= \
MACHINE \
@@ -93,12 +93,12 @@ mkextravars: .PHONY
@echo $i="${$i}"
.endfor
.if ${MKCOMPAT} != "no"
- @echo COMPATARCHDIRS=${COMPATARCHDIRS} | ${SED} -e's/ /,/g'
+ @echo COMPATARCHDIRS=${COMPATARCHDIRS} | ${TOOL_SED} -e 's/ /,/g'
.else
@echo COMPATARCHDIRS=
.endif
.if ${MKKMOD} != "no" && ${MKCOMPATMODULES} != "no"
- @echo KMODARCHDIRS=${KMODARCHDIRS} | ${SED} -e's/ /,/g'
+ @echo KMODARCHDIRS=${KMODARCHDIRS} | ${TOOL_SED} -e 's/ /,/g'
.else
@echo KMODARCHDIRS=
.endif
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.175 src/distrib/sets/sets.subr:1.176
--- src/distrib/sets/sets.subr:1.175 Tue May 24 20:07:20 2016
+++ src/distrib/sets/sets.subr Tue May 24 20:14:47 2016
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.175 2016/05/25 00:07:20 christos Exp $
+# $NetBSD: sets.subr,v 1.176 2016/05/25 00:14:47 christos Exp $
#
#
@@ -126,7 +126,7 @@ done
IFS=$oIFS
-MKVARS="$( SED=${SED} ${MAKE} -B -f ${rundir}/mkvars.mk mkvars | ${SED} -e 's,=.*,,' | ${XARGS} )"
+MKVARS="$( ${MAKE} -B -f ${rundir}/mkvars.mk mkvars | ${SED} -e 's,=.*,,' | ${XARGS} )"
#####
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.175 2016/05/25 00:07:20 christos Exp $
+# # $NetBSD: sets.subr,v 1.176 2016/05/25 00:14:47 christos Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
