2005-01-28  Stepan Kasal  <address@hidden>

	* src/efgrep.in: New file, template for egrep and fgrep script.
	  Use the name under which is GNU grep installed, including
	  --program-prefix etc.
	  If ${0%/*} doesn't work, use dirname; if both fail, fall back
	  to hardwired $(bindir).
	* src/Makefile.am: Use the template.

Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/grep/grep/src/Makefile.am,v
retrieving revision 1.32
diff -u -r1.32 Makefile.am
--- src/Makefile.am	23 Nov 2004 12:49:36 -0000	1.32
+++ src/Makefile.am	28 Jan 2005 13:52:10 -0000
@@ -15,18 +15,14 @@
 localedir = $(datadir)/locale
 INCLUDES = -I../intl -I$(top_srcdir)/lib -DLOCALEDIR=\"$(localedir)\"
 
-EXTRA_DIST = \
+EXTRA_DIST = efgrep.in \
              dosbuf.c \
              vms_fab.c vms_fab.h
 
 OPTION_for_egrep = -E
 OPTION_for_fgrep = -F
 
-egrep fgrep: Makefile
-	(echo '#!/bin/sh'; \
-	echo 'case $$0 in' ; \
-	echo '  */*) dir=$${0%/*}/ ;;' ; \
-	echo '  *) dir="" ;;' ; \
-	echo 'esac' ; \
-	echo 'exec $${dir}grep $(OPTION_for_$@) $${1+"$$@"}' ) >$@
+egrep fgrep: Makefile efgrep.in
+	p=`echo grep | sed '$(transform);s/$$/$(EXEEXT)/'`; \
+	sed 's/@-EF@/$(OPTION_for_$@)/g;s,address@hidden@,$(bindir),g;s,address@hidden@,'"$$p",g efgrep.in >$@
 	chmod a+x $@
Index: src/efgrep.in
===================================================================
RCS file: src/efgrep.in
diff -N src/efgrep.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/efgrep.in	28 Jan 2005 13:52:10 -0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+# `egrep' and `fgrep' are deprecated by POSIX; you are supposed to acquire
+# the habit of using `grep -E' and `grep -F' instead.
+case $0 in
+*/*) if { dir=${0%/*}; } 2>/dev/null; then
+        dir=${0%/*}
+     else
+        dir=`dirname "$0"`
+     fi ;;
+*) dir="" ;;
+esac
+grep='@grep@'
+if test "x$dir" = x || test ! -f "$dir/$grep"; then
+	dir='@bindir@'
+fi
+exec "$dir/$grep" @-EF@ ${1+"$@"}