summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorapb <apb@NetBSD.org>2008-10-25 22:27:34 +0000
committerapb <apb@NetBSD.org>2008-10-25 22:27:34 +0000
commitf46c1de7cbdec5bc8a818069ff8760cb0b3581d2 (patch)
tree5c3118f28e2161d36621caa1dc75ffe469312e1f /gnu
parent89799ead73e9671c68327c04a475cc5762a86697 (diff)
Use ${TOOL_SED} instead if plain sed in Makefiles.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/lib/libbfd/Makefile16
-rw-r--r--gnu/lib/libgcc4/libgcc_s/Makefile5
-rw-r--r--gnu/usr.bin/binutils/c++filt/Makefile4
-rw-r--r--gnu/usr.bin/gcc4/backend/Makefile17
-rw-r--r--gnu/usr.bin/gdb6/bfd/Makefile16
-rw-r--r--gnu/usr.bin/gdb6/sim/ppc/Makefile10
-rw-r--r--gnu/usr.bin/groff/Makefile.inc9
-rw-r--r--gnu/usr.bin/groff/font/Makefile.tty8
-rw-r--r--gnu/usr.bin/groff/font/devps/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/libs/libgroff/Makefile4
-rw-r--r--gnu/usr.bin/groff/src/roff/troff/Makefile8
-rw-r--r--gnu/usr.bin/groff/tmac/Makefile8
-rw-r--r--gnu/usr.bin/send-pr/Makefile10
-rw-r--r--gnu/usr.bin/send-pr/Makefile.in17
-rw-r--r--gnu/usr.bin/texinfo/Makefile4
-rw-r--r--gnu/usr.bin/xcvs/cvsbug/Makefile6
16 files changed, 79 insertions, 67 deletions
diff --git a/gnu/lib/libbfd/Makefile b/gnu/lib/libbfd/Makefile
index 8dc6ad5ba55..20b68842a4f 100644
--- a/gnu/lib/libbfd/Makefile
+++ b/gnu/lib/libbfd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2008/04/20 07:11:22 mrg Exp $
+# $NetBSD: Makefile,v 1.44 2008/10/25 22:27:35 apb Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -54,28 +54,28 @@ targets.o targets.so: targmatch.h Makefile
targmatch.h: config.bfd targmatch.sed
${_MKTARGET_CREATE}
- sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} >$@
+ ${TOOL_SED} -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} >$@
elf32-target.h: elfxx-target.h
${_MKTARGET_CREATE}
- sed -e s/NN/32/g < $> > $@
+ ${TOOL_SED} -e s/NN/32/g < $> > $@
elf64-target.h: elfxx-target.h
${_MKTARGET_CREATE}
- sed -e s/NN/64/g < $> > $@
+ ${TOOL_SED} -e s/NN/64/g < $> > $@
elf32-ia64.c: elfxx-ia64.c
${_MKTARGET_CREATE}
- sed -e s/NN/32/g < $> > $@
+ ${TOOL_SED} -e s/NN/32/g < $> > $@
elf64-ia64.c: elfxx-ia64.c
${_MKTARGET_CREATE}
- sed -e s/NN/64/g < $> > $@
+ ${TOOL_SED} -e s/NN/64/g < $> > $@
peigen.c: peXXigen.c
${_MKTARGET_CREATE}
- sed -e s/XX/pe/g < $> > $@
+ ${TOOL_SED} -e s/XX/pe/g < $> > $@
pepigen.c: peXXigen.c
${_MKTARGET_CREATE}
- sed -e s/XX/pep/g < $> > $@
+ ${TOOL_SED} -e s/XX/pep/g < $> > $@
diff --git a/gnu/lib/libgcc4/libgcc_s/Makefile b/gnu/lib/libgcc4/libgcc_s/Makefile
index 1f1a90e6452..153ed0c61f7 100644
--- a/gnu/lib/libgcc4/libgcc_s/Makefile
+++ b/gnu/lib/libgcc4/libgcc_s/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2008/10/19 22:05:20 apb Exp $
+# $NetBSD: Makefile,v 1.7 2008/10/25 22:27:35 apb Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -41,7 +41,8 @@ libgcc.map: ${LIBGCC_S_OBJS} ${G_SHLIB_MKMAP} ${G_SHLIB_MAPFILES}
${NM} ${G_SHLIB_NM_FLAGS} ${LIBGCC_S_OBJS}; \
echo %%; \
cat ${G_SHLIB_MAPFILES} | \
- sed -e "/^[ ]*#/d" -e 's/^%\(if\|else\|elif\|endif\|define\)/#\1/' | \
+ ${TOOL_SED} -e "/^[ ]*#/d" \
+ -e 's/^%\(if\|else\|elif\|endif\|define\)/#\1/' | \
${CC} ${G_LIBGCC2_CFLAGS} ${G_INCLUDES} -E -xassembler-with-cpp -; \
} | ${TOOL_AWK} -f ${G_SHLIB_MKMAP} > ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}
diff --git a/gnu/usr.bin/binutils/c++filt/Makefile b/gnu/usr.bin/binutils/c++filt/Makefile
index 46207089501..af6c93d8ea5 100644
--- a/gnu/usr.bin/binutils/c++filt/Makefile
+++ b/gnu/usr.bin/binutils/c++filt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/10/21 10:01:20 lukem Exp $
+# $NetBSD: Makefile,v 1.15 2008/10/25 22:27:35 apb Exp $
PROG= c++filt
CPPFLAGS+= -DMAIN
@@ -12,4 +12,4 @@ CLEANFILES+= c++filt.1
c++filt.1: ${DIST}/binutils/doc/cxxfilt.man
${_MKTARGET_CREATE}
- sed -e "s/@PROGRAM@/${PROG}/" < $> > $@
+ ${TOOL_SED} -e "s/@PROGRAM@/${PROG}/" < $> > $@
diff --git a/gnu/usr.bin/gcc4/backend/Makefile b/gnu/usr.bin/gcc4/backend/Makefile
index 177f040b3e5..4d9ed6efab4 100644
--- a/gnu/usr.bin/gcc4/backend/Makefile
+++ b/gnu/usr.bin/gcc4/backend/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/10/19 22:05:20 apb Exp $
+# $NetBSD: Makefile,v 1.13 2008/10/25 22:27:35 apb Exp $
LIBISPRIVATE= yes
@@ -196,21 +196,24 @@ build-rtl.c: rtl.c \
${G_RTL_H} real.h ${G_GCC_H} errors.h gtype-desc.h
${_MKTARGET_CREATE}
rm -f build-rtl.c
- sed -e 's/<config[.]h/hconfig.h/' ${GNUHOSTDIST}/gcc/rtl.c >${.TARGET}
+ ${TOOL_SED} -e 's/<config[.]h/hconfig.h/' \
+ ${GNUHOSTDIST}/gcc/rtl.c >${.TARGET}
build-rtl.lo: ${HH}
build-print-rtl.c: print-rtl.c \
${G_RTL_H} ${G_TREE_H} hard-reg-set.h ${G_BASIC_BLOCK_H}
${_MKTARGET_CREATE}
rm -f buid-print-rtl.c
- sed -e 's/<config[.]h/hconfig.h/' ${GNUHOSTDIST}/gcc/print-rtl.c >${.TARGET}
+ ${TOOL_SED} -e 's/<config[.]h/hconfig.h/' \
+ ${GNUHOSTDIST}/gcc/print-rtl.c >${.TARGET}
build-print-rtl.lo: ${HH}
build-bitmap.c: bitmap.c \
${G_RTL_H} flags.h ${G_BASIC_BLOCK_H} ${REGS_H} ${G_GCC_H} gtype-desc.h
${_MKTARGET_CREATE}
rm -f build-bitmap.c
- sed -e 's/<config[.]h/hconfig.h/' ${GNUHOSTDIST}/gcc/bitmap.c >${.TARGET}
+ ${TOOL_SED} -e 's/<config[.]h/hconfig.h/' \
+ ${GNUHOSTDIST}/gcc/bitmap.c >${.TARGET}
build-bitmap.lo: ${HH}
build-errors.c: errors.c errors.h
@@ -223,14 +226,16 @@ build-varray.c: varray.c \
${G_RTL_H} ${G_GCC_H} ${TREE_H} bitmap.h errors.h
${_MKTARGET_CREATE}
rm -f build-varray.c
- sed -e 's/<config[.]h/hconfig.h/' ${GNUHOSTDIST}/gcc/varray.c >${.TARGET}
+ ${TOOL_SED} -e 's/<config[.]h/hconfig.h/' \
+ ${GNUHOSTDIST}/gcc/varray.c >${.TARGET}
build-varray.lo: ${HH} gtype-desc.h
build-ggc-none.c: ggc-none.c \
${G_GCC_H} gtype-desc.h
${_MKTARGET_CREATE}
rm -f build-ggc-none.c
- sed -e 's/<config[.]h/hconfig.h/' ${GNUHOSTDIST}/gcc/ggc-none.c >${.TARGET}
+ ${TOOL_SED} -e 's/<config[.]h/hconfig.h/' \
+ ${GNUHOSTDIST}/gcc/ggc-none.c >${.TARGET}
build-ggc-none.lo: ${HH}
#
diff --git a/gnu/usr.bin/gdb6/bfd/Makefile b/gnu/usr.bin/gdb6/bfd/Makefile
index 4015ac06b6f..998d292ee0c 100644
--- a/gnu/usr.bin/gdb6/bfd/Makefile
+++ b/gnu/usr.bin/gdb6/bfd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:30 lukem Exp $
+# $NetBSD: Makefile,v 1.4 2008/10/25 22:27:35 apb Exp $
.include <bsd.own.mk>
@@ -38,28 +38,28 @@ targets.o targets.so: targmatch.h Makefile
targmatch.h: config.bfd targmatch.sed
${_MKTARGET_CREATE}
- sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} >$@
+ ${TOOL_SED} -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} >$@
elf32-target.h: elfxx-target.h
${_MKTARGET_CREATE}
- sed -e s/NN/32/g < $> > $@
+ ${TOOL_SED} -e s/NN/32/g < $> > $@
elf64-target.h: elfxx-target.h
${_MKTARGET_CREATE}
- sed -e s/NN/64/g < $> > $@
+ ${TOOL_SED} -e s/NN/64/g < $> > $@
elf32-ia64.c: elfxx-ia64.c
${_MKTARGET_CREATE}
- sed -e s/NN/32/g < $> > $@
+ ${TOOL_SED} -e s/NN/32/g < $> > $@
elf64-ia64.c: elfxx-ia64.c
${_MKTARGET_CREATE}
- sed -e s/NN/64/g < $> > $@
+ ${TOOL_SED} -e s/NN/64/g < $> > $@
peigen.c: peXXigen.c
${_MKTARGET_CREATE}
- sed -e s/XX/pe/g < $> > $@
+ ${TOOL_SED} -e s/XX/pe/g < $> > $@
pepigen.c: peXXigen.c
${_MKTARGET_CREATE}
- sed -e s/XX/pep/g < $> > $@
+ ${TOOL_SED} -e s/XX/pep/g < $> > $@
diff --git a/gnu/usr.bin/gdb6/sim/ppc/Makefile b/gnu/usr.bin/gdb6/sim/ppc/Makefile
index 15d2f67fc77..5f261ea9b3c 100644
--- a/gnu/usr.bin/gdb6/sim/ppc/Makefile
+++ b/gnu/usr.bin/gdb6/sim/ppc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:31 lukem Exp $
+# $NetBSD: Makefile,v 1.4 2008/10/25 22:27:35 apb Exp $
LIBISPRIVATE= yes
NOGCCERROR=
@@ -149,7 +149,7 @@ run-hw: Makefile
done ; \
for hw in $$f; do \
echo $$hw; \
- done | sed -e 's/^.*\(hw_.*\)\.c/\1/' \
+ done | ${TOOL_SED} -e 's/^.*\(hw_.*\)\.c/\1/' \
-e 's/^/extern const device_descriptor /' \
-e 's/$$/_device_descriptor\[\];/' \
> tmp-hw.h
@@ -162,7 +162,7 @@ run-hw: Makefile
done ; \
for hw in $$f; do \
echo $$hw; \
- done | sed -e 's/^.*\(hw_.*\)\.c/\1/' \
+ done | ${TOOL_SED} -e 's/^.*\(hw_.*\)\.c/\1/' \
-e 's/^/ /' \
-e 's/$$/_device_descriptor,/' > tmp-hw.c
${MIC} tmp-hw.h hw.h
@@ -185,7 +185,7 @@ run-pk: $(PACKAGE_SRC)
done ; \
for pk in $$f; do \
echo $$pk; \
- done | sed -e 's/^.*pk_\(.*\)\.c/\1/' \
+ done | ${TOOL_SED} -e 's/^.*pk_\(.*\)\.c/\1/' \
-e 's/^/extern package_create_instance_callback pk_/' \
-e 's/$$/_create_instance;/' > tmp-pk.h
${MIC} tmp-pk.h pk.h
@@ -196,7 +196,7 @@ DPSRCS+= ${PK_H}
DEFINES_H= defines.h
${DEFINES_H}: run-defines
run-defines:
- sed -n -e '/^#define HAVE_/s/ 1$$/",/' \
+ ${TOOL_SED} -n -e '/^#define HAVE_/s/ 1$$/",/' \
-e '/^#define HAVE_/s//"HAVE_/p' \
< ${.CURDIR}/../arch/${MACHINE_ARCH}/config.h > tmp-defines.h
${MIC} tmp-defines.h defines.h
diff --git a/gnu/usr.bin/groff/Makefile.inc b/gnu/usr.bin/groff/Makefile.inc
index 7164f2712d0..bc55e6e5e36 100644
--- a/gnu/usr.bin/groff/Makefile.inc
+++ b/gnu/usr.bin/groff/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 2006/06/02 22:16:23 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.17 2008/10/25 22:27:35 apb Exp $
# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.7 2003/05/01 13:22:18 ru Exp $
@@ -110,12 +110,13 @@ CLEANFILES+= ${GROFFYSRCS:.y=.cpp} ${GROFFYSRCS:.y=_tab.h}
.SUFFIXES: .man .1 .2 .3 .4 .5 .6 .7 .8
version=`cat $(GROFF_DIST)/VERSION`
-revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(GROFF_DIST)/REVISION`
+revision=`${TOOL_SED} -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' \
+ $(GROFF_DIST)/REVISION`
.man.8 .man.7 .man.6 .man.5 .man.4 .man.3 .man.2 .man.1:
${_MKTARGET_CREATE}
rm -f $@
- sed -e "s;@BINDIR@;${BINDIR};g" \
+ ${TOOL_SED} -e "s;@BINDIR@;${BINDIR};g" \
-e "s;@FONTDIR@;$(fontdir);g" \
-e "s;@LOCALFONTDIR@;$(localfontdir);g" \
-e "s;@LEGACYFONTDIR@;$(legacyfontdir);g" \
@@ -150,7 +151,7 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(GROFF_DIST)/REVISION`
.sh .pl:
${_MKTARGET_CREATE}
rm -f $@
- sed -e "s|@BINDIR@|${BINDIR}|g" \
+ ${TOOL_SED} -e "s|@BINDIR@|${BINDIR}|g" \
-e "s;@FONTDIR@;$(fontdir);g" \
-e 's|@GROFF_BIN_PATH_SETUP@|GROFF_RUNTIME="$${GROFF_BIN_PATH=/usr/bin}:"|g' \
-e "s|@SEP@|:|" \
diff --git a/gnu/usr.bin/groff/font/Makefile.tty b/gnu/usr.bin/groff/font/Makefile.tty
index 43839f858a4..48d3dad5f4f 100644
--- a/gnu/usr.bin/groff/font/Makefile.tty
+++ b/gnu/usr.bin/groff/font/Makefile.tty
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile.tty,v 1.7 2003/10/21 10:01:20 lukem Exp $
+# $NetBSD: Makefile.tty,v 1.8 2008/10/25 22:27:35 apb Exp $
# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.tty,v 2.7 2001/04/17 12:36:42 ru Exp $
+.include <bsd.own.mk>
+
all: ${FONTS}
FONTS?=R I B BI S L CW
@@ -15,7 +17,7 @@ LPI=6
$(FONTS): R.proto
${_MKTARGET_CREATE}
(charwidth=`expr $(RES) / $(CPI)` ; \
- sed -e "s/^name [A-Z]*$$/name ${.TARGET}/" \
+ ${TOOL_SED} -e "s/^name [A-Z]*$$/name ${.TARGET}/" \
-e "s/^\\([^ ]*\\) [0-9]+ /\\1 $$charwidth /" \
-e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
-e "s/^internalname .*$$/internalname $@/" \
@@ -27,7 +29,7 @@ $(FONTS): R.proto
DESC: DESC.proto
${_MKTARGET_CREATE}
- sed -e "s/^res .*$$/res $(RES)/" \
+ ${TOOL_SED} -e "s/^res .*$$/res $(RES)/" \
-e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
-e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
-e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
diff --git a/gnu/usr.bin/groff/font/devps/Makefile b/gnu/usr.bin/groff/font/devps/Makefile
index 89b19f5afff..a38deb04c79 100644
--- a/gnu/usr.bin/groff/font/devps/Makefile
+++ b/gnu/usr.bin/groff/font/devps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/10/21 10:01:20 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2008/10/25 22:27:35 apb Exp $
# $FreeBSD: src/gnu/usr.bin/groff/font/devps/Makefile,v 1.3 2003/05/01 13:22:18 ru Exp $
@@ -36,7 +36,7 @@ DESC: DESC.in
${PSFILES}:
${_MKTARGET_CREATE}
rm -f $@
- sed -f ${DIST_DIR}/psstrip.sed $? >$@
+ ${TOOL_SED} -f ${DIST_DIR}/psstrip.sed $? >$@
.include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/src/libs/libgroff/Makefile b/gnu/usr.bin/groff/src/libs/libgroff/Makefile
index 3b42a3c7ee6..d1fdfff737e 100644
--- a/gnu/usr.bin/groff/src/libs/libgroff/Makefile
+++ b/gnu/usr.bin/groff/src/libs/libgroff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/05/03 14:48:30 lukem Exp $
+# $NetBSD: Makefile,v 1.10 2008/10/25 22:27:35 apb Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/libs/libgroff/Makefile,v 1.5 2003/05/01 13:22:19 ru Exp $
@@ -32,5 +32,5 @@ version.cpp: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION
echo 'const char *version_string = "'$$v'";' ;\
echo 'const char *revision_string = "'$$r'";' ;\
echo 'extern "C" const char *Version_string = "'$$v'.'$$r'";' |\
- sed -e 's/\.0\"/\"/'; \
+ ${TOOL_SED} -e 's/\.0\"/\"/'; \
) > ${.TARGET}
diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile b/gnu/usr.bin/groff/src/roff/troff/Makefile
index 66c6e29db87..093731f55ca 100644
--- a/gnu/usr.bin/groff/src/roff/troff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/troff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2008/02/26 03:20:07 lukem Exp $
+# $NetBSD: Makefile,v 1.10 2008/10/25 22:27:35 apb Exp $
# $FreeBSD: src/gnu/usr.bin/groff/src/roff/troff/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $
@@ -17,8 +17,10 @@ USETBL=
majorminor.cpp: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION
${_MKTARGET_CREATE}
(\
- maj=`sed -e 's/^\([^.]*\)\..*$$/\1/' ${GROFF_DIST}/VERSION` ;\
- min=`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' ${GROFF_DIST}/VERSION` ;\
+ maj=`${TOOL_SED} -e 's/^\([^.]*\)\..*$$/\1/' \
+ ${GROFF_DIST}/VERSION` ;\
+ min=`${TOOL_SED} -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' \
+ ${GROFF_DIST}/VERSION` ;\
r=`cat ${GROFF_DIST}/REVISION` ;\
echo 'const char *major_version = "'$$maj'";' ;\
echo 'const char *minor_version = "'$$min'";' ;\
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index 5e4e45c8e50..af0f69db188 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/02/06 18:29:48 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2008/10/25 22:27:35 apb Exp $
# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.41 2003/05/01 13:22:21 ru Exp $
@@ -54,7 +54,7 @@ FILES+= $f-s
FILESNAME_$f-s=mdoc/$f
$f-s: $f
${_MKTARGET_CREATE}
- sed -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET}
+ ${TOOL_SED} -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET}
.endfor
.for f in ${STRIPFILES}
@@ -62,7 +62,7 @@ FILES+= $f-s
FILESNAME_$f-s=$f
$f-s: $f
${_MKTARGET_CREATE}
- sed -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET}
+ ${TOOL_SED} -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET}
.endfor
.for f in ${SPECIALFILES}
@@ -70,7 +70,7 @@ FILES+= $f-s
FILESNAME_$f-s=$f
$f-s: $f
${_MKTARGET_CREATE}
- sed -e "s;@TMAC_AN_PREFIX@;${tmac_an_prefix};g" \
+ ${TOOL_SED} -e "s;@TMAC_AN_PREFIX@;${tmac_an_prefix};g" \
-e "s;@TMAC_S_PREFIX@;${tmac_s_prefix};g" \
-e "s;@PNMTOPS_NOSETPAGE@;pnmtops -nosetpage;g" \
${.ALLSRC} > ${.TARGET}
diff --git a/gnu/usr.bin/send-pr/Makefile b/gnu/usr.bin/send-pr/Makefile
index 2965a1516bf..2ebf277d7d2 100644
--- a/gnu/usr.bin/send-pr/Makefile
+++ b/gnu/usr.bin/send-pr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2003/12/04 23:32:37 keihan Exp $
+# $NetBSD: Makefile,v 1.30 2008/10/25 22:27:35 apb Exp $
.include <bsd.own.mk>
@@ -56,7 +56,7 @@ realall: send-pr send-pr.1 send-pr.el install-sid
send-pr: send-pr.sh Makefile
${_MKTARGET_CREATE}
- sed -e 's,xVERSIONx,$(VERSION),' \
+ ${TOOL_SED} -e 's,xVERSIONx,$(VERSION),' \
-e 's,xGNATS_ROOTx,$(GNATS_ROOT),' \
-e 's,xGNATS_ADDRx,$(GNATS_ADDR),' \
-e 's,xGNATS_SITEx,$(GNATS_SITE),' \
@@ -72,14 +72,14 @@ send-pr: send-pr.sh Makefile
install-sid: install-sid.sh Makefile
${_MKTARGET_CREATE}
- sed -e 's,xBINDIRx,$(bindir),g' \
+ ${TOOL_SED} -e 's,xBINDIRx,$(bindir),g' \
-e 's,xVERSIONx,$(VERSION),g' $(srcdir)/install-sid.sh > $@-t
mv -f $@-t $@
chmod 755 $@
send-pr.el: send-pr-el.in Makefile
${_MKTARGET_CREATE}
- sed -e 's,xVERSIONx,$(VERSION),' \
+ ${TOOL_SED} -e 's,xVERSIONx,$(VERSION),' \
-e 's,xGNATS_ROOTx,$(GNATS_ROOT),' \
-e 's,xGNATS_SITEx,$(GNATS_SITE),' \
-e 's,xDATADIRx,$(datadir),' \
@@ -91,7 +91,7 @@ send-pr.el: send-pr-el.in Makefile
send-pr.1: send-pr.man Makefile
${_MKTARGET_CREATE}
- sed -e 's,xGNATS_ROOTx,$(GNATS_ROOT),g' \
+ ${TOOL_SED} -e 's,xGNATS_ROOTx,$(GNATS_ROOT),g' \
-e 's,xVERSIONx,$(VERSION),g' $(srcdir)/send-pr.man > $@-t
mv -f $@-t $@
diff --git a/gnu/usr.bin/send-pr/Makefile.in b/gnu/usr.bin/send-pr/Makefile.in
index a9b5f4cc3ed..0f762b2932d 100644
--- a/gnu/usr.bin/send-pr/Makefile.in
+++ b/gnu/usr.bin/send-pr/Makefile.in
@@ -122,7 +122,7 @@ states.texi s-usage.texi categ.texi send-pr.sh
all: send-pr install-sid send-pr.elc send-pr.1
send-pr: send-pr.sh Makefile
- sed -e 's,xVERSIONx,$(VERSION),' \
+ ${TOOL_SED} -e 's,xVERSIONx,$(VERSION),' \
-e 's,xGNATS_ROOTx,$(GNATS_ROOT),' \
-e 's,xGNATS_ADDRx,$(GNATS_ADDR),' \
-e 's,xGNATS_SITEx,$(GNATS_SITE),' \
@@ -137,13 +137,13 @@ send-pr: send-pr.sh Makefile
chmod 755 $@
install-sid: install-sid.sh Makefile
- sed -e 's,xBINDIRx,$(bindir),g' \
+ ${TOOL_SED} -e 's,xBINDIRx,$(bindir),g' \
-e 's,xVERSIONx,$(VERSION),g' $(srcdir)/install-sid.sh > $@-t
mv $@-t $@
chmod 755 $@
send-pr.el: send-pr-el.in Makefile
- sed -e 's,xVERSIONx,$(VERSION),' \
+ ${TOOL_SED} -e 's,xVERSIONx,$(VERSION),' \
-e 's,xGNATS_ROOTx,$(GNATS_ROOT),' \
-e 's,xGNATS_SITEx,$(GNATS_SITE),' \
-e 's,xDATADIRx,$(datadir),' \
@@ -178,13 +178,14 @@ install-gnats-dist:
$(INSTALL_DATA) $(srcdir)/README $(datadir)/gnats/dist/README
$(INSTALL_DATA) $(srcdir)/INSTALL $(datadir)/gnats/dist/INSTALL
$(INSTALL_DATA) $(srcdir)/MANIFEST $(datadir)/gnats/dist/MANIFEST
- sed -e 's/"DEFAULT_RELEASE") ".*"/"DEFAULT_RELEASE") "@''DEFAULT_RELEASE@"/' \
+ ${TOOL_SED} \
+ -e 's/"DEFAULT_RELEASE") ".*"/"DEFAULT_RELEASE") "@''DEFAULT_RELEASE@"/' \
-e 's/"SUBMITTER") ".*"/"SUBMITTER") "@''SUBMITTER@"/' \
-e 's/"DATADIR") ".*"/"DATADIR") "@''DATADIR@"/' \
send-pr.el > $(datadir)/gnats/dist/send-pr-el.inT
mv $(datadir)/gnats/dist/send-pr-el.inT \
$(datadir)/gnats/dist/send-pr-el.in
- sed -e 's/GNATS_ROOT=.*/GNATS_ROOT=/' \
+ ${TOOL_SED} -e 's/GNATS_ROOT=.*/GNATS_ROOT=/' \
-e 's/SUBMITTER=.*/SUBMITTER=@''SUBMITTER@/' \
-e 's/DEFAULT_RELEASE=.*/DEFAULT_RELEASE="@''DEFAULT_RELEASE@"/' \
-e 's/DEFAULT_ORGANIZATION=.*/DEFAULT_ORGANIZATION=/' \
@@ -192,7 +193,7 @@ install-gnats-dist:
send-pr > $(datadir)/gnats/dist/send-pr.sh-t
mv $(datadir)/gnats/dist/send-pr.sh-t \
$(datadir)/gnats/dist/send-pr.sh
- sed -e 's/^BINDIR=.*/BINDIR=@''BINDIR@/' \
+ ${TOOL_SED} -e 's/^BINDIR=.*/BINDIR=@''BINDIR@/' \
install-sid > $(datadir)/gnats/dist/install-sid.sT
mv $(datadir)/gnats/dist/install-sid.sT \
$(datadir)/gnats/dist/install-sid.sh
@@ -237,7 +238,7 @@ version.texi: Makefile
mv $@-t $@
send-pr.1: Makefile
- sed -e 's,xGNATS_ROOTx,$(GNATS_ROOT),g' \
+ ${TOOL_SED} -e 's,xGNATS_ROOTx,$(GNATS_ROOT),g' \
-e 's,xVERSIONx,$(VERSION),g' $(srcdir)/send-pr.man > $@-t
mv $@-t $@
@@ -252,7 +253,7 @@ send-pr.dvi: version.texi
gnats-build: stamp-gnats
stamp-gnats: Makefile
- sed -e 's,^GNATS_ROOT =.*,GNATS_ROOT = $(GNATS_ROOT),' \
+ ${TOOL_SED} -e 's,^GNATS_ROOT =.*,GNATS_ROOT = $(GNATS_ROOT),' \
-e 's,^GNATS_ADDR =.*,GNATS_ADDR = $(GNATS_ADDR),' \
-e 's,^GNATS_SITE =.*,GNATS_SITE = $(GNATS_SITE),' \
-e 's,^DEFAULT_RELEASE =.*,DEFAULT_RELEASE = $(DEFAULT_RELEASE),' \
diff --git a/gnu/usr.bin/texinfo/Makefile b/gnu/usr.bin/texinfo/Makefile
index adca713e610..a54d4154498 100644
--- a/gnu/usr.bin/texinfo/Makefile
+++ b/gnu/usr.bin/texinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/09/02 08:38:35 christos Exp $
+# $NetBSD: Makefile,v 1.22 2008/10/25 22:27:35 apb Exp $
.include <bsd.own.mk>
@@ -11,7 +11,7 @@ FILES= epsf.tex texinfo.cat texinfo.dtd texinfo.tex texinfo.xsl
VERSION!= sed -n "s/^\#define VERSION \"\(.*\)\"/\1/p" ${NETBSDSRCDIR}/gnu/usr.bin/texinfo/common/config.h
texinfo.cat: texinfo-cat.in
- sed 's/__VERSION__/${VERSION}/g' ${.ALLSRC} >${.TARGET}
+ ${TOOL_SED} 's/__VERSION__/${VERSION}/g' ${.ALLSRC} >${.TARGET}
realall: texinfo.cat
diff --git a/gnu/usr.bin/xcvs/cvsbug/Makefile b/gnu/usr.bin/xcvs/cvsbug/Makefile
index 9d132980a36..2f929c75308 100644
--- a/gnu/usr.bin/xcvs/cvsbug/Makefile
+++ b/gnu/usr.bin/xcvs/cvsbug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2006/02/04 16:22:53 christos Exp $
+# $NetBSD: Makefile,v 1.2 2008/10/25 22:27:35 apb Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -11,7 +11,7 @@ CLEANFILES+=.fname cvsbug
cvsbug: cvsbug.in
${_MKTARGET_CREATE}
- sed -e 's,@PACKAGE_BUGREPORT@,bug-cvs@gnu.org,g' \
+ ${TOOL_SED} -e 's,@PACKAGE_BUGREPORT@,bug-cvs@gnu.org,g' \
-e "s,@VERSION@,`cat .fname`,g" ${.ALLSRC} > ${.TARGET}
chmod a+x ${.TARGET}
@@ -20,7 +20,7 @@ cvsbug: .fname
.fname: configure
${_MKTARGET_CREATE}
echo > .fname \
- cvs-`sed < ${.ALLSRC} \
+ cvs-`${TOOL_SED} < ${.ALLSRC} \
-e '/PACKAGE_VERSION/!d' \
-e 's/[^0-9.]*\([0-9.]*\).*/\1/' \
-e q`