Module Name: src
Committed By: christos
Date: Wed May 25 00:07:20 UTC 2016
Modified Files:
src/distrib/sets: Makefile sets.subr
Log Message:
Fix SED issue differently.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/distrib/sets/Makefile
cvs rdiff -u -r1.174 -r1.175 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/Makefile
diff -u src/distrib/sets/Makefile:1.101 src/distrib/sets/Makefile:1.102
--- src/distrib/sets/Makefile:1.101 Tue May 24 18:28:56 2016
+++ src/distrib/sets/Makefile Tue May 24 20:07:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2016/05/24 22:28:56 christos Exp $
+# $NetBSD: Makefile,v 1.102 2016/05/25 00:07:20 christos Exp $
# Experimental RCS METALOG versioning
# (Needs host's rcs(1) commands)
@@ -90,7 +90,7 @@ print_set_lists_base print_set_lists_x p
list_set_lists_base list_set_lists_x list_set_lists_ext \
list_set_files_base list_set_files_x list_set_files_ext \
: .PHONY
- @export ${SETSENV}; rundir="${.CURDIR}"; . ./sets.subr; ${.TARGET}
+ @${SETSENV}; rundir="${.CURDIR}"; . ./sets.subr; ${.TARGET}
#
# METALOG MANIPULATION TARGETS
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.174 src/distrib/sets/sets.subr:1.175
--- src/distrib/sets/sets.subr:1.174 Sat Feb 20 23:16:36 2016
+++ src/distrib/sets/sets.subr Tue May 24 20:07:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.174 2016/02/21 04:16:36 christos Exp $
+# $NetBSD: sets.subr,v 1.175 2016/05/25 00:07:20 christos Exp $
#
#
@@ -126,7 +126,7 @@ done
IFS=$oIFS
-MKVARS="$( ${MAKE} -B -f ${rundir}/mkvars.mk mkvars | ${SED} -e 's,=.*,,' | ${XARGS} )"
+MKVARS="$( SED=${SED} ${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.174 2016/02/21 04:16:36 christos Exp $
+# # $NetBSD: sets.subr,v 1.175 2016/05/25 00:07:20 christos Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
