grep branch, master, updated. v2.6.1-27-g0f7ab96

[Jim Meyering]

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  0f7ab96dc723ccc497d652a72798661adf9504c6 (commit)
      from  222e774d684d64cfb0713cba8c921eb94e54a91f (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=0f7ab96dc723ccc497d652a72798661adf9504c6


commit 0f7ab96dc723ccc497d652a72798661adf9504c6
Author: Jim Meyering <address@hidden>
Date:   Mon Mar 29 11:05:38 2010 +0200

    build: make doc/Makefile.am cleaner and more robust
    
    * doc/Makefile.am (egrep.1 fgrep.1): Generate robustly, i.e.,
    do not redirect directly to address@hidden
    Use $(AM_V_GEN).
    Do not distribute intermediate files like fgrep.man and egrep.man.
    Likewise, do not use them to generate their %.1 images.
    Instead, generate the .1 files directly.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d21a914..b4d0a2d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -21,14 +21,9 @@ grep_TEXINFOS = fdl.texi
 
 man_MANS = grep.1 fgrep.1 egrep.1
 
-EXTRA_DIST = grep.1 egrep.man fgrep.man
-
+EXTRA_DIST = grep.1
 CLEANFILES = egrep.1 fgrep.1
 
-fgrep.1: fgrep.man
-       inst=`echo "grep" | sed '$(transform)'`.1; \
-sed -e "address@hidden@%$$inst%g" $(srcdir)/fgrep.man > $@
-
-egrep.1: egrep.man
-       inst=`echo "grep" | sed '$(transform)'`.1; \
-sed -e "address@hidden@%$$inst%g" $(srcdir)/egrep.man > $@
+egrep.1 fgrep.1: Makefile.am
+       $(AM_V_GEN)inst=`echo grep | sed '$(transform)'`.1 \
+         && echo ".so man1/$$inst" > address@hidden && mv address@hidden $@

-----------------------------------------------------------------------

Summary of changes:
 doc/Makefile.am |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
grep