Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/sets Fix SED issue differently.



details:   https://anonhg.NetBSD.org/src/rev/76c60f1352ea
branches:  trunk
changeset: 815549:76c60f1352ea
user:      christos <christos%NetBSD.org@localhost>
date:      Wed May 25 00:07:20 2016 +0000

description:
Fix SED issue differently.

diffstat:

 distrib/sets/Makefile  |  4 ++--
 distrib/sets/sets.subr |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 4765acff11ce -r 76c60f1352ea distrib/sets/Makefile
--- a/distrib/sets/Makefile     Tue May 24 22:28:56 2016 +0000
+++ b/distrib/sets/Makefile     Wed May 25 00:07:20 2016 +0000
@@ -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 @@
 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
diff -r 4765acff11ce -r 76c60f1352ea distrib/sets/sets.subr
--- a/distrib/sets/sets.subr    Tue May 24 22:28:56 2016 +0000
+++ b/distrib/sets/sets.subr    Wed May 25 00:07:20 2016 +0000
@@ -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 @@
 
 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 @@
 # 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



Home | Main Index | Thread Index | Old Index