This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".
The branch, master has been updated
via 685b3f73f75b5ce95ef468dd81d4a2302e2de82f (commit)
via b98cf069c3b7311a7255e03c3bc48efd7500e8db (commit)
from 709e7e5d54dbdc83e3290b8c5adc79b36c71886c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=685b3f73f75b5ce95ef468dd81d4a2302e2de82f
commit 685b3f73f75b5ce95ef468dd81d4a2302e2de82f
Author: Jim Meyering <[email protected]>
Date: Sat May 24 22:41:21 2014 -0700
build: improve rule to generate egrep+fgrep scripts
* src/Makefile.am (egrep fgrep): chmod a=rx generated files,
and remove $@-t before attempting to redirect to it, in case it
is read-only.
diff --git a/src/Makefile.am b/src/Makefile.am
index e2c82a4..0697c63 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,19 +45,20 @@ AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
EXTRA_DIST = dosbuf.c egrep.sh
egrep fgrep: egrep.sh Makefile
- $(AM_V_GEN)grep=`echo grep | sed -e '$(transform)'` && \
- case $@ in egrep) option=-E;; fgrep) option=-F;; esac && \
+ $(AM_V_GEN)rm -f $@-t
+ $(AM_V_at)grep=`echo grep | sed -e '$(transform)'` && \
+ case $@ in egrep) option=-E;; fgrep) option=-F;; esac && \
shell_does_substrings='set x/y && d=$${1%/*} && test "$$d" = x' && \
- if $(SHELL) -c "$$shell_does_substrings" 2>/dev/null; then \
- edit_substring='s,X,X,'; \
- else \
+ if $(SHELL) -c "$$shell_does_substrings" 2>/dev/null; then \
+ edit_substring='s,X,X,'; \
+ else \
edit_substring='s,\$${0%/\*},`expr "X$$0" : '\''X\\(.*\\)/'\''`,g'; \
- fi && \
- sed -e 's|[@]SHELL@|$(SHELL)|g' \
- -e "$$edit_substring" \
- -e "s|[@]grep@|$$grep|g" \
+ fi && \
+ sed -e 's|[@]SHELL@|$(SHELL)|g' \
+ -e "$$edit_substring" \
+ -e "s|[@]grep@|$$grep|g" \
-e "s|[@]option@|$$option|g" <$(srcdir)/egrep.sh >$@-t
- $(AM_V_at)chmod +x $@-t
+ $(AM_V_at)chmod a=rx $@-t
$(AM_V_at)mv $@-t $@
CLEANFILES = egrep fgrep *-t
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=b98cf069c3b7311a7255e03c3bc48efd7500e8db
commit 685b3f73f75b5ce95ef468dd81d4a2302e2de82f
Author: Jim Meyering <[email protected]>
Date: Sat May 24 22:41:21 2014 -0700
build: improve rule to generate egrep+fgrep scripts
* src/Makefile.am (egrep fgrep): chmod a=rx generated files,
and remove $@-t before attempting to redirect to it, in case it
is read-only.
diff --git a/src/Makefile.am b/src/Makefile.am
index e2c82a4..0697c63 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,19 +45,20 @@ AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
EXTRA_DIST = dosbuf.c egrep.sh
egrep fgrep: egrep.sh Makefile
- $(AM_V_GEN)grep=`echo grep | sed -e '$(transform)'` && \
- case $@ in egrep) option=-E;; fgrep) option=-F;; esac && \
+ $(AM_V_GEN)rm -f $@-t
+ $(AM_V_at)grep=`echo grep | sed -e '$(transform)'` && \
+ case $@ in egrep) option=-E;; fgrep) option=-F;; esac && \
shell_does_substrings='set x/y && d=$${1%/*} && test "$$d" = x' && \
- if $(SHELL) -c "$$shell_does_substrings" 2>/dev/null; then \
- edit_substring='s,X,X,'; \
- else \
+ if $(SHELL) -c "$$shell_does_substrings" 2>/dev/null; then \
+ edit_substring='s,X,X,'; \
+ else \
edit_substring='s,\$${0%/\*},`expr "X$$0" : '\''X\\(.*\\)/'\''`,g'; \
- fi && \
- sed -e 's|[@]SHELL@|$(SHELL)|g' \
- -e "$$edit_substring" \
- -e "s|[@]grep@|$$grep|g" \
+ fi && \
+ sed -e 's|[@]SHELL@|$(SHELL)|g' \
+ -e "$$edit_substring" \
+ -e "s|[@]grep@|$$grep|g" \
-e "s|[@]option@|$$option|g" <$(srcdir)/egrep.sh >$@-t
- $(AM_V_at)chmod +x $@-t
+ $(AM_V_at)chmod a=rx $@-t
$(AM_V_at)mv $@-t $@
CLEANFILES = egrep fgrep *-t
-----------------------------------------------------------------------
Summary of changes:
lib/Makefile.am | 5 ++++-
src/Makefile.am | 21 +++++++++++----------
2 files changed, 15 insertions(+), 11 deletions(-)
hooks/post-receive
--
grep
