On Wed, Mar 26, 2014 at 9:33 PM, Paul Eggert <[email protected]> wrote: > Norihiro Tanaka wrote: >> >> Fail in reversed-range-endpoints test after egrep and fgrep go back to >> shell scripts. I seem that the program name doesn't remove correctly. > > Thanks, I fixed that in a different way, with the attached patch.
Thanks, but that made it so non-srcdir builds (and "make dist") fail. I've fixed that with the attached patch.
From e4994366166059c7320fbb97a930100b1cc79e61 Mon Sep 17 00:00:00 2001 From: Jim Meyering <[email protected]> Date: Wed, 26 Mar 2014 21:57:48 -0700 Subject: [PATCH] maint: fix "make dist" * src/Makefile.am (egrep fgrep): Specify egrep.sh via $(srcdir)/egrep.sh, so non-srcdir builds work once again. --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 27a2bc3..3487848 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,7 +49,7 @@ egrep fgrep: egrep.sh Makefile case $@ in egrep) option=-E;; fgrep) option=-F;; esac && \ sed -e 's|[@]SHELL@|$(SHELL)|g' \ -e "s|[@]grep@|$$grep|g" \ - -e "s|[@]option@|$$option|g" <egrep.sh >$@-t + -e "s|[@]option@|$$option|g" <$(srcdir)/egrep.sh >$@-t $(AM_V_at)chmod +x $@-t $(AM_V_at)mv $@-t $@ -- 1.9.0.258.g00eda23
