From: ceriel <none@none>
Date: Mon, 14 Aug 1995 08:08:56 +0000 (+0000)
Subject: 'ed -' is no longer supported by some systems. Use 'ed -s'
X-Git-Tag: release-5-5~104
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=c587ca287eec1e673c8d363997c9af314523b3fa;p=ack.git

'ed -' is no longer supported by some systems. Use 'ed -s'
---

diff --git a/first/get_makepars b/first/get_makepars
index 1042579cd..24cdf85a3 100755
--- a/first/get_makepars
+++ b/first/get_makepars
@@ -69,7 +69,7 @@ then
 	fi
 	case $ACM in
 	sun3|sparc)
-		ed - make_macros <<'EOF'
+		ed -s make_macros <<'EOF'
 /cc-and-mkdep.sun/s/^..//
 w
 q
diff --git a/first/install_tail b/first/install_tail
index 5313a3a43..99aff0ea2 100644
--- a/first/install_tail
+++ b/first/install_tail
@@ -21,7 +21,7 @@ $SRC_HOME/first/limit_impl
 
 case $SYSNAME in
 i386)
-	ed - $TARGET_HOME/lib/descr/fe << 'ABC'
+	ed -s $TARGET_HOME/lib/descr/fe << 'ABC'
 1,$s/-D{NAME}/-D{NAME} -DNO_PROTOTYPE/
 w
 q
@@ -41,12 +41,12 @@ fi
 
 case X$SYSVAX in
 Xvax_sysV_2)
-	ed - $TARGET_HOME/lib/vax4/descr << 'ABC'
+	ed -s $TARGET_HOME/lib/vax4/descr << 'ABC'
 /CPP_F/s/$/ -D__USG/
 w
 q
 ABC
-	ed - $CONFIG/mach/vax4/Action << 'ABC'
+	ed -s $CONFIG/mach/vax4/Action << 'ABC'
 /libbsd4_2/s/libbsd4_2/libsysV_2/
 w
 q
@@ -54,7 +54,7 @@ ABC
 	( cd $CONFIG/mach/vax4
 	  for i in libcc libcc.ansi
 	  do
-	  	ed - $i/Makefile << 'ABC'
+	  	ed -s $i/Makefile << 'ABC'
 /BFS/s/BFS/UFS/
 w
 q
@@ -63,14 +63,14 @@ ABC
 	)
 	;;
 Xvax_bsd4_2)
-	ed - $TARGET_HOME/lib/vax4/descr << 'ABC'
+	ed -s $TARGET_HOME/lib/vax4/descr << 'ABC'
 /CPP_F/s/$/ -D__BSD4_2/
 w
 q
 ABC
 	;;
 Xvax_bsd4_1a)
-	ed - $CONFIG/mach/vax4/Action << 'ABC'
+	ed -s $CONFIG/mach/vax4/Action << 'ABC'
 /libbsd4_2/s/libbsd4_2/libbsd4_1a/
 w
 q
diff --git a/first/limit_impl b/first/limit_impl
index 058dd89f7..2314ab7a0 100755
--- a/first/limit_impl
+++ b/first/limit_impl
@@ -1,13 +1,13 @@
 for i in $DISABLE_LANG
 do
-	ed - $CONFIG/Action <<EOF
+	ed -s $CONFIG/Action <<EOF
 /^name "$i/;/^end/s/^/!/
 w
 q
 EOF
 	case $i in
 	Modula-2)
-		ed - $CONFIG/Action <<EOF
+		ed -s $CONFIG/Action <<EOF
 /^name "$i definition/;/^end/s/^/!/
 /^name "$i makefile/;/^end/s/^/!/
 w
@@ -15,14 +15,14 @@ q
 EOF
 		;;
 	ANSI-C)	: install compiler anyway
-		ed - $CONFIG/Action <<EOF
+		ed -s $CONFIG/Action <<EOF
 /^!name "$i frontend/;/^!end/s/^!//
 w
 q
 EOF
 		;;
 	C)	: install compiler anyway
-		ed - $CONFIG/Action <<EOF
+		ed -s $CONFIG/Action <<EOF
 /^!name "$i frontend/;/^!end/s/^!//
 w
 q
@@ -112,7 +112,7 @@ done
 DISABLE_INT=0
 for i in $DISABLE_SUP
 do
-	ed - $CONFIG/Action <<EOF
+	ed -s $CONFIG/Action <<EOF
 /^dir .*$i\$/;?^name?;/^end/s/^/!/
 w
 q
@@ -170,7 +170,7 @@ m68*|sun2|sun3|pmds*)
 esac
 if test $DISABLE_INT = 1
 then
-	ed - $CONFIG/Action <<EOF
+	ed -s $CONFIG/Action <<EOF
 /68000 interpreters/;/^end/s/^/!/
 w
 q
@@ -185,7 +185,7 @@ then
 		do
 			if fgrep -s $j $i
 			then
-				ed - $i <<EOF
+				ed -s $i <<EOF
 /$j/;?^name?,/^end/s/^/!/
 w
 q
@@ -197,7 +197,7 @@ fi
 
 if [ $DO_FAST = n ]
 then
-	ed - $CONFIG/Action <<'EOF'
+	ed -s $CONFIG/Action <<'EOF'
 /^name "Peephole optimizer lib/;/^end/s/^/!/
 /^name "Fast/;$s/^/!/
 w
diff --git a/first/mk_config b/first/mk_config
index 9a204ee12..6af9ee9b1 100755
--- a/first/mk_config
+++ b/first/mk_config
@@ -77,7 +77,7 @@ do
 		mk_makefile $SRC_HOME/mach/proto/ncg/proto.make | sed -e "/#MACH_DEFINE/,/^MACH/s/=.*/= $i/" > Makefile
 		if [ -f $SRC_HOME/mach/$i/ncg/table_dir ]
 		then
-			ed - Makefile <<EOF
+			ed -s Makefile <<EOF
 /^#TABLE_DEFINE/+1r $SRC_HOME/mach/$i/ncg/table_dir
 w
 q
diff --git a/first/mk_makefile b/first/mk_makefile
index 3fa122dbc..97435474b 100755
--- a/first/mk_makefile
+++ b/first/mk_makefile
@@ -14,7 +14,7 @@ esac
 
 cp $1 /tmp/mk_mak$$
 
-ed - /tmp/mk_mak$$ << 'EOF'
+ed -s /tmp/mk_mak$$ << 'EOF'
 /^#PARAMS/c
 #PARAMS		do not remove this line!
 .
@@ -23,7 +23,7 @@ q
 EOF
 case `ack_sys` in
 sparc_solaris)
-	ed - /tmp/mk_mak$$ << 'EOF'
+	ed -s /tmp/mk_mak$$ << 'EOF'
 g/^EXTRALIB/s/=/= -lelf/
 w
 q