From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 30 May 2002 06:05:05 +0000 (+0000)
Subject: fgrep -> $FGREP, egrep -> $EGREP
X-Git-Tag: Release-1-6-1b~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=852e99bc98ba69911de80bc72898f00781ece36a;p=thirdparty%2Fautomake.git

fgrep -> $FGREP, egrep -> $EGREP
---

diff --git a/tests/aclocali.test b/tests/aclocali.test
index dfd3d3314..2ba6fe496 100755
--- a/tests/aclocali.test
+++ b/tests/aclocali.test
@@ -22,4 +22,4 @@ $ACLOCAL -I macros || exit 1
 
 $AUTOMAKE || exit 1
 
-fgrep quux.m4 Makefile.in
+$FGREP quux.m4 Makefile.in
diff --git a/tests/acoutput2.test b/tests/acoutput2.test
index 6af5440d9..c2ea9c377 100755
--- a/tests/acoutput2.test
+++ b/tests/acoutput2.test
@@ -20,7 +20,7 @@ mkdir subdir
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-count=`fgrep foo.in Makefile.in | wc -l`
+count=`$FGREP foo.in Makefile.in | wc -l`
 test $count -eq 2 || exit 1
 
 # This ought to work as well.
diff --git a/tests/all.test b/tests/all.test
index 2387dbe76..98c233d33 100755
--- a/tests/all.test
+++ b/tests/all.test
@@ -11,6 +11,6 @@ for target in all install-exec install-data uninstall; do
    $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-   fgrep "${target}-local ${target}-local" Makefile.in && exit 1
+   $FGREP "${target}-local ${target}-local" Makefile.in && exit 1
 done
 exit 0
diff --git a/tests/ansi.test b/tests/ansi.test
index 3b7da79e0..81b40f90b 100755
--- a/tests/ansi.test
+++ b/tests/ansi.test
@@ -21,5 +21,5 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed
+$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
 $MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep 'ansi2knr\.c'
diff --git a/tests/ansi4.test b/tests/ansi4.test
index ac03bbf56..7c4afea0a 100755
--- a/tests/ansi4.test
+++ b/tests/ansi4.test
@@ -24,4 +24,4 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep 'ansi2knr.$(' Makefile.in || exit 1
+$FGREP 'ansi2knr.$(' Makefile.in || exit 1
diff --git a/tests/colon3.test b/tests/colon3.test
index 3e5d6b7c8..630e99241 100755
--- a/tests/colon3.test
+++ b/tests/colon3.test
@@ -26,8 +26,8 @@ test -f zardoz.in || exit 1
 # never just "zardoz" -- except the actual automake invocation can
 # refer to it (don't ask).
 echo Grep1
-grep zardoz zardoz.in | fgrep -v 'zardoz.in' | fgrep -v 'zardoz.am' \
-   | fgrep -v AUTOMAKE > O
+grep zardoz zardoz.in | $FGREP -v 'zardoz.in' | $FGREP -v 'zardoz.am' \
+   | $FGREP -v AUTOMAKE > O
 # We cat the output file so we see in when verbose.
 cat O
 test -z "`cat O`" || exit 1
diff --git a/tests/cond21.test b/tests/cond21.test
index 05b07c7b1..32d641df0 100755
--- a/tests/cond21.test
+++ b/tests/cond21.test
@@ -61,5 +61,5 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
 ./configure
-$MAKE test | fgrep 'BAR: bar12 bar bar3 :BAR'
-$MAKE test | fgrep 'FOO: foo foo1 foo1b foo2 :FOO'
+$MAKE test | $FGREP 'BAR: bar12 bar bar3 :BAR'
+$MAKE test | $FGREP 'FOO: foo foo1 foo1b foo2 :FOO'
diff --git a/tests/condlib.test b/tests/condlib.test
index e64062f28..3ba6f03ab 100755
--- a/tests/condlib.test
+++ b/tests/condlib.test
@@ -24,5 +24,5 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep librsaref.a.c Makefile.in && exit 1
+$FGREP librsaref.a.c Makefile.in && exit 1
 exit 0
diff --git a/tests/confh4.test b/tests/confh4.test
index 4837ea595..06280af88 100755
--- a/tests/confh4.test
+++ b/tests/confh4.test
@@ -27,4 +27,4 @@ mkdir include
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-egrep '^DEFAULT_INCLUDES =.* -I(\.|\$\(top_builddir\))/include' Makefile.in
+$EGREP '^DEFAULT_INCLUDES =.* -I(\.|\$\(top_builddir\))/include' Makefile.in
diff --git a/tests/confsub.test b/tests/confsub.test
index 3007c2da7..423a0d3cc 100755
--- a/tests/confsub.test
+++ b/tests/confsub.test
@@ -29,16 +29,16 @@ $AUTOMAKE || exit 1
 # One line is allowed though:
 #
 # cd $(top_builddir) && $(SHELL) ./config.status subdir/config.h
-(fgrep 'subdir/config.h' subdir/Makefile.in |
-   fgrep -v 'cd $(top_builddir)') && exit 1
+($FGREP 'subdir/config.h' subdir/Makefile.in |
+   $FGREP -v 'cd $(top_builddir)') && exit 1
 
 $AUTOCONF || exit 1
 ./configure || exit 1
-fgrep 'Before.' subdir/config.h
+$FGREP 'Before.' subdir/config.h
 
 sleep 2
 echo 'After.' > subdir/config.hin
 $MAKE || exit 1
-fgrep 'After.' subdir/config.h || exit 1
+$FGREP 'After.' subdir/config.h || exit 1
 
 exit 0
diff --git a/tests/cxxansi.test b/tests/cxxansi.test
index 1b43d5e38..b31baa942 100755
--- a/tests/cxxansi.test
+++ b/tests/cxxansi.test
@@ -25,7 +25,7 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep 'jane$U' Makefile.in && exit 1
-fgrep 'doe$U' Makefile.in || exit 1
+$FGREP 'jane$U' Makefile.in && exit 1
+$FGREP 'doe$U' Makefile.in || exit 1
 
 exit 0
diff --git a/tests/cxxo.test b/tests/cxxo.test
index 8fe584b36..2f83621d1 100755
--- a/tests/cxxo.test
+++ b/tests/cxxo.test
@@ -17,4 +17,4 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep 'doe.$(OBJEXT)' Makefile.in
+$FGREP 'doe.$(OBJEXT)' Makefile.in
diff --git a/tests/depend4.test b/tests/depend4.test
index da56d6b7c..55ff3bf8b 100755
--- a/tests/depend4.test
+++ b/tests/depend4.test
@@ -19,7 +19,7 @@ END
 
     $AUTOMAKE || exit 1
 
-    egrep '^(@[^@]+@)*DEP_FILES = ' Makefile.in || exit 1
+    $EGREP '^(@[^@]+@)*DEP_FILES = ' Makefile.in || exit 1
 done
 
 exit 0
diff --git a/tests/discover.test b/tests/discover.test
index 37052b73c..ccb2114ee 100755
--- a/tests/discover.test
+++ b/tests/discover.test
@@ -20,5 +20,5 @@ END
 : > fsusage.c
 
 $ACLOCAL || exit 1
-$AUTOMAKE 2>&1 | fgrep fsusage.c || exit 1
+$AUTOMAKE 2>&1 | $FGREP fsusage.c || exit 1
 exit 0
diff --git a/tests/distname.test b/tests/distname.test
index 3b3b27fa0..934506093 100755
--- a/tests/distname.test
+++ b/tests/distname.test
@@ -29,5 +29,5 @@ $AUTOMAKE --include-deps --copy --add-missing
 $MAKE dist
 
 gunzip nonesuch-0.23.tar.gz
-(tar tf nonesuch-0.23.tar | fgrep './nonesuch-0.23/a.c') && exit 1
+(tar tf nonesuch-0.23.tar | $FGREP './nonesuch-0.23/a.c') && exit 1
 exit 0
diff --git a/tests/dup3.test b/tests/dup3.test
index e0c831e60..8afd68596 100755
--- a/tests/dup3.test
+++ b/tests/dup3.test
@@ -17,4 +17,4 @@ END
 # Strip all options from ACLOCAL, especially -I's.
 ACLOCAL="`echo $ACLOCAL | sed -e 's/ -.*$//'` --acdir=$testsrcdir/../m4"
 $ACLOCAL -I zoo || exit 1
-fgrep zardoz aclocal.m4
+$FGREP zardoz aclocal.m4
diff --git a/tests/empty4.test b/tests/empty4.test
index 0ed85da08..054a17640 100755
--- a/tests/empty4.test
+++ b/tests/empty4.test
@@ -20,5 +20,5 @@ END
 
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
-fgrep zoo. Makefile.in && exit 1
+$FGREP zoo. Makefile.in && exit 1
 exit 0
diff --git a/tests/fo.test b/tests/fo.test
index 3c76e08ca..f9429a387 100755
--- a/tests/fo.test
+++ b/tests/fo.test
@@ -19,4 +19,4 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep 'doe.$(OBJEXT)' Makefile.in
+$FGREP 'doe.$(OBJEXT)' Makefile.in
diff --git a/tests/implicit.test b/tests/implicit.test
index d2bb72f32..d421f1316 100755
--- a/tests/implicit.test
+++ b/tests/implicit.test
@@ -16,4 +16,4 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-grep '^libapp_1_OBJECTS' Makefile.in | fgrep '.$(OBJEXT)'
+grep '^libapp_1_OBJECTS' Makefile.in | $FGREP '.$(OBJEXT)'
diff --git a/tests/insh2.test b/tests/insh2.test
index 001050083..0d1c9e4e6 100755
--- a/tests/insh2.test
+++ b/tests/insh2.test
@@ -13,5 +13,5 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed
+$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
 $MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep install-sh
diff --git a/tests/interp.test b/tests/interp.test
index 7e21ba11c..b3ec58b63 100755
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -17,4 +17,4 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep 'z.$(OBJEXT)' Makefile.in
+$FGREP 'z.$(OBJEXT)' Makefile.in
diff --git a/tests/lex.test b/tests/lex.test
index 3ca4ec7c9..177982bed 100755
--- a/tests/lex.test
+++ b/tests/lex.test
@@ -21,11 +21,11 @@ $AUTOMAKE || exit 1
 
 # Test to make sure that lex source generates correct target.
 
-fgrep '$(LEX)' Makefile.in || exit 1
+$FGREP '$(LEX)' Makefile.in || exit 1
 
 # Test to make sure that lex source generates correct clean rule.
 # From Ralf Corsepius.
 
-fgrep joel Makefile.in && exit 1
+$FGREP joel Makefile.in && exit 1
 
 exit 0
diff --git a/tests/lex3.test b/tests/lex3.test
index 9133b4a92..f110ea306 100755
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -66,4 +66,4 @@ $MAKE distcheck
 
 # foo.c must be shipped.
 gunzip am_lex_bug-0.1.1.tar.gz
-tar tf am_lex_bug-0.1.1.tar | fgrep foo.c
+tar tf am_lex_bug-0.1.1.tar | $FGREP foo.c
diff --git a/tests/lex4.test b/tests/lex4.test
index b40fc54fc..10c187545 100755
--- a/tests/lex4.test
+++ b/tests/lex4.test
@@ -21,4 +21,4 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep joe.Po Makefile.in
+$FGREP joe.Po Makefile.in
diff --git a/tests/libobj5.test b/tests/libobj5.test
index 9af320d59..5bd028be9 100755
--- a/tests/libobj5.test
+++ b/tests/libobj5.test
@@ -20,4 +20,4 @@ END
 
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
-fgrep foo.c Makefile.in
+$FGREP foo.c Makefile.in
diff --git a/tests/libobj7.test b/tests/libobj7.test
index 2c7ddf0f0..11de68f9d 100755
--- a/tests/libobj7.test
+++ b/tests/libobj7.test
@@ -33,4 +33,4 @@ sed -n -e ': again
      n
      s/^/DIST_COMMON/
      b again
-  }' < Makefile.in | fgrep dirname.c
+  }' < Makefile.in | $FGREP dirname.c
diff --git a/tests/make.test b/tests/make.test
index 310cb176e..6cc511913 100755
--- a/tests/make.test
+++ b/tests/make.test
@@ -33,12 +33,12 @@ save="$MAKE"
 for flag in '' -w; do
    MAKE="$save $flag" ./configure
 
-   fgrep 'am__include = include' Makefile
+   $FGREP 'am__include = include' Makefile
 
    touch configure.in
    $MAKE $flag
 
-   fgrep 'am__include = include' Makefile
+   $FGREP 'am__include = include' Makefile
 
    rm -f config.cache
 done
diff --git a/tests/makevars.test b/tests/makevars.test
index 323c843ed..f1c0d8bff 100755
--- a/tests/makevars.test
+++ b/tests/makevars.test
@@ -14,6 +14,6 @@ $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
 # We are definitely not needing a compiler or preprocessor.
-egrep '^(CC|CPP|CXX|CXXCPP) =' Makefile.in && exit 1
+$EGREP '^(CC|CPP|CXX|CXXCPP) =' Makefile.in && exit 1
 
 exit 0
diff --git a/tests/nostdinc.test b/tests/nostdinc.test
index 2faf1d2ac..d769ca7b3 100755
--- a/tests/nostdinc.test
+++ b/tests/nostdinc.test
@@ -17,5 +17,5 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep -e '-I.' Makefile.in && exit 1
+$FGREP -e '-I.' Makefile.in && exit 1
 exit 0
diff --git a/tests/parse.test b/tests/parse.test
index 76ca60b25..5b65b72ac 100755
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -22,5 +22,5 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep zar.cdoz Makefile.in && exit 1
+$FGREP zar.cdoz Makefile.in && exit 1
 exit 0
diff --git a/tests/pluseq.test b/tests/pluseq.test
index f7673a473..08189429a 100755
--- a/tests/pluseq.test
+++ b/tests/pluseq.test
@@ -14,4 +14,4 @@ END
 
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
-fgrep 'zar doz' Makefile.in
+$FGREP 'zar doz' Makefile.in
diff --git a/tests/pluseq4.test b/tests/pluseq4.test
index 5f8637faf..ac8226808 100755
--- a/tests/pluseq4.test
+++ b/tests/pluseq4.test
@@ -15,4 +15,4 @@ END
 
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
-fgrep '@CC@ -Dwhatever' Makefile.in
+$FGREP '@CC@ -Dwhatever' Makefile.in
diff --git a/tests/pluseq6.test b/tests/pluseq6.test
index ae8e869ab..54b015f50 100755
--- a/tests/pluseq6.test
+++ b/tests/pluseq6.test
@@ -14,7 +14,7 @@ END
 
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
-fgrep '@mandir@ foo' Makefile.in || exit 1
+$FGREP '@mandir@ foo' Makefile.in || exit 1
 
 num=`grep '^mandir =' Makefile.in | wc -l`
 test $num -eq 1
diff --git a/tests/pr2.test b/tests/pr2.test
index c93be6d43..32c394980 100755
--- a/tests/pr2.test
+++ b/tests/pr2.test
@@ -20,4 +20,4 @@ $AUTOMAKE || exit 1
 
 # Look for mkinstalldirs invocation for the templ directory.
 # We use the `[^/]' to avoid matching `templ/README.foo.in'.
-egrep 'mkinstalldirs.*templ([^/]|$)' Makefile.in
+$EGREP 'mkinstalldirs.*templ([^/]|$)' Makefile.in
diff --git a/tests/pr9.test b/tests/pr9.test
index afc455186..5fa6abd86 100755
--- a/tests/pr9.test
+++ b/tests/pr9.test
@@ -31,4 +31,4 @@ $MAKE distcheck || exit 1
 
 gunzip pr9-0.tar.gz || exit 1
 
-tar tf pr9-0.tar | fgrep support
+tar tf pr9-0.tar | $FGREP support
diff --git a/tests/seenc.test b/tests/seenc.test
index 544b02029..d265f2996 100755
--- a/tests/seenc.test
+++ b/tests/seenc.test
@@ -24,5 +24,5 @@ $ACLOCAL || exit 1
 # output for this test, and we just want to make sure some of
 # them are about CC and CXX being undefined.
 $AUTOMAKE --Wno-error 2> err && exit 1
-fgrep CC err || exit 1
-fgrep CXX err || exit 1
+$FGREP CC err || exit 1
+$FGREP CXX err || exit 1
diff --git a/tests/specflags.test b/tests/specflags.test
index 2e03e74fa..465280bc2 100755
--- a/tests/specflags.test
+++ b/tests/specflags.test
@@ -30,6 +30,6 @@ grep 'COMPILE. [^-]' Makefile.in && exit 1
 grep '[^-]foo\.o' Makefile.in && exit 1
 
 # Regression test for missing space.
-fgrep ')-c' Makefile.in && exit 1
+$FGREP ')-c' Makefile.in && exit 1
 
 exit 0
diff --git a/tests/specflags3.test b/tests/specflags3.test
index f6cdd116e..a86026b4a 100755
--- a/tests/specflags3.test
+++ b/tests/specflags3.test
@@ -23,11 +23,11 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep -e '-o foo-foo' Makefile.in || exit 1
+$FGREP -e '-o foo-foo' Makefile.in || exit 1
 
-fgrep 'foo.o.o' Makefile.in                       && exit 1
-fgrep 'foo.$(OBJEXT).$(OBJEXT)' Makefile.in       && exit 1
+$FGREP 'foo.o.o' Makefile.in                       && exit 1
+$FGREP 'foo.$(OBJEXT).$(OBJEXT)' Makefile.in       && exit 1
 
-fgrep '$(foo_CFLAGS)' Makefile.in || exit 1
+$FGREP '$(foo_CFLAGS)' Makefile.in || exit 1
 
 exit 0
diff --git a/tests/specflags6.test b/tests/specflags6.test
index cd94304af..ebf4a582e 100755
--- a/tests/specflags6.test
+++ b/tests/specflags6.test
@@ -26,7 +26,7 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-uncondval=`fgrep 'foo-foo.o: foo.c' Makefile.in`
+uncondval=`$FGREP 'foo-foo.o: foo.c' Makefile.in`
 
 cat >> Makefile.am << 'END'
 foo_SOURCES += $(BAR_SRCS)
@@ -34,6 +34,6 @@ END
 
 $AUTOMAKE || exit 1
 
-condval=`fgrep 'foo-foo.o: foo.c' Makefile.in`
+condval=`$FGREP 'foo-foo.o: foo.c' Makefile.in`
 
 test "x$uncondval" = "x$condval"
diff --git a/tests/subobj.test b/tests/subobj.test
index f9245b857..9c33fd7ee 100755
--- a/tests/subobj.test
+++ b/tests/subobj.test
@@ -20,7 +20,7 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep 'generic/a.$(OBJEXT)' Makefile.in || exit 1
+$FGREP 'generic/a.$(OBJEXT)' Makefile.in || exit 1
 grep '[^/]a\.\$(OBJEXT)' Makefile.in && exit 1
 
 # Opportunistically test for a different bug.
diff --git a/tests/subobj2.test b/tests/subobj2.test
index 2d46f2f1e..4a4bbf82a 100755
--- a/tests/subobj2.test
+++ b/tests/subobj2.test
@@ -19,6 +19,6 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep 'generic/a.$(OBJEXT)' Makefile.in || exit 1
+$FGREP 'generic/a.$(OBJEXT)' Makefile.in || exit 1
 grep '[^/]a\.\$(OBJEXT)' Makefile.in && exit 1
-fgrep -e '-c -o' Makefile.in
+$FGREP -e '-c -o' Makefile.in
diff --git a/tests/suffix3.test b/tests/suffix3.test
index 31c910c67..277658a33 100755
--- a/tests/suffix3.test
+++ b/tests/suffix3.test
@@ -21,8 +21,8 @@ $AUTOMAKE || exit 1
 
 # The foo.cc intermediate step is implicit, it's a mistake if
 # Automake requires this file somewhere.
-fgrep foo.cc Makefile.in && exit 1
+$FGREP foo.cc Makefile.in && exit 1
 # However Automake must figure that foo.zoo is eventually
 # transformed into foo.o, and use this latter file (to link foo).
-fgrep 'foo.$(OBJEXT)' Makefile.in || exit 1
+$FGREP 'foo.$(OBJEXT)' Makefile.in || exit 1
 exit 0
diff --git a/tests/texinfo.test b/tests/texinfo.test
index 3ade53230..c05e90219 100755
--- a/tests/texinfo.test
+++ b/tests/texinfo.test
@@ -17,5 +17,5 @@ echo '@setfilename textutils.info' > textutils.texi
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed
+$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
 $MAKE -s -f Makefile.sed SHELL=/bin/sh magic | grep 'texinfo\.tex'
diff --git a/tests/texinfo6.test b/tests/texinfo6.test
index 6df755629..1cf03f5d9 100755
--- a/tests/texinfo6.test
+++ b/tests/texinfo6.test
@@ -13,4 +13,4 @@ echo '@setfilename foo.info' > foo.txi
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep '.txi.info' Makefile.in
+$FGREP '.txi.info' Makefile.in
diff --git a/tests/texinfo8.test b/tests/texinfo8.test
index 98cfdbe20..3d24e6459 100755
--- a/tests/texinfo8.test
+++ b/tests/texinfo8.test
@@ -29,7 +29,7 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE -a || exit 1
 
-fgrep -v @SET_MAKE@ sub/Makefile.in > sub/Makefile.sed
+$FGREP -v @SET_MAKE@ sub/Makefile.in > sub/Makefile.sed
 test -f sub/texinfo.tex &&
 $MAKE -s -f sub/Makefile.sed SHELL=/bin/sh magic | grep 'texinfo\.tex'
 stat=$?
diff --git a/tests/vtexi.test b/tests/vtexi.test
index b99636097..b837ba98a 100755
--- a/tests/vtexi.test
+++ b/tests/vtexi.test
@@ -34,8 +34,8 @@ grep '^textutils\.info: textutils\.texi .*version\.texi$' Makefile.in
 # When running the first version of configure.ac aware automake,
 # @CONFIGURE_AC@ was not properly substitued.
 
-egrep '^\$\(srcdir\)/stamp-vti:.*textutils\.texi( .*)?$' Makefile.in
-egrep '^\$\(srcdir\)/stamp-vti:.*\$\(top_srcdir\)/configure\.in( .*)?$' Makefile.in
+$EGREP '^\$\(srcdir\)/stamp-vti:.*textutils\.texi( .*)?$' Makefile.in
+$EGREP '^\$\(srcdir\)/stamp-vti:.*\$\(top_srcdir\)/configure\.in( .*)?$' Makefile.in
 
 
 # Check that the path to mdate-sh is correct.  Over escaping of `$'
diff --git a/tests/yacc3.test b/tests/yacc3.test
index dbd61ec86..07f652474 100755
--- a/tests/yacc3.test
+++ b/tests/yacc3.test
@@ -21,7 +21,7 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 
-fgrep -v @SET_MAKE@ Makefile.in > Makefile.sed
+$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
 # It should not be disted here
 grep 'zardoz.h' Makefile.in && exit 1
 
diff --git a/tests/yacc6.test b/tests/yacc6.test
index b89467643..e17e01447 100755
--- a/tests/yacc6.test
+++ b/tests/yacc6.test
@@ -30,5 +30,5 @@ END
 $ACLOCAL || exit 1
 $AUTOMAKE -a || exit 1
 test -f ylwrap || exit 1
-fgrep '(srcdir)/ylwrap' sub/Makefile.in && exit 1
+$FGREP '(srcdir)/ylwrap' sub/Makefile.in && exit 1
 exit 0