Remove Id: from bison.1.

* doc/Makefile.am (remove_time_stamp): Include the sed invocation.
(perl -0777 -pi -e 's/.PPnId): New.
(.x.1): Use it to ignore the version control revision.

diff --git a/ChangeLog b/ChangeLog
index 527a89551e0ef677d5c582692f08788d4f6caf46..b286b3d245012d9d2c9f61c17a19698cdf5ac405 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-05  Akim Demaille  <akim@epita.fr>
+
+       Remove Id: from bison.1.
+       * doc/Makefile.am (remove_time_stamp): Include the sed invocation.
+       (perl -0777 -pi -e 's/\.PP\nId): New.
+       (.x.1): Use it to ignore the version control revision.
+

 2007-11-05  Akim Demaille  <demaille@gostai.com>
 
        * build-aux/Makefile.am: Ship cross-options.pl.
 2007-11-05  Akim Demaille  <demaille@gostai.com>
 
        * build-aux/Makefile.am: Ship cross-options.pl.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2cbd2bc8246030d50b2659516d124e3400fdd6d3..a97af2bffcdf99628b469b97a7b34d33c85673c7 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -58,7 +58,14 @@ common_dep = $(top_srcdir)/configure.ac $(srcdir)/common.x
 srcsrcdir = $(top_srcdir)/bin
 $(srcdir)/bison.1:      $(common_dep) $(top_srcdir)/src/getargs.c
 
 srcsrcdir = $(top_srcdir)/bin
 $(srcdir)/bison.1:      $(common_dep) $(top_srcdir)/src/getargs.c
 

-remove_time_stamp = 's/^\(\.TH[^"]*"[^"]*"[^"]*\)"[^"]*"/\1/'
+# Output from --help and --version that must not appear in the man page.
+neutralize = \
+  perl -0777 -pi -e 's/\.PP\nId:.*\n//g'
+
+# Differences to ignore when comparing the man page (the date).
+remove_time_stamp = \
+  sed 's/^\(\.TH[^"]*"[^"]*"[^"]*\)"[^"]*"/\1/'
+

 
 MOSTLYCLEANFILES = $(srcdir)/*.t
 
 
 MOSTLYCLEANFILES = $(srcdir)/*.t
 


@@ -81,8 +88,9 @@ PREPATH = $(top_builddir)/src
            --include=$*.x                                                   \
            --include=$(srcdir)/common.x                                     \
            --output=$@.t `echo '$*' | sed 's,.*/,,'`
            --include=$*.x                                                   \
            --include=$(srcdir)/common.x                                     \
            --output=$@.t `echo '$*' | sed 's,.*/,,'`

-       if sed $(remove_time_stamp) $@ >$@a.t 2>/dev/null &&                 \
-          sed $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then \
+       $(neutralize) $@.t
+       if $(remove_time_stamp) $@ >$@a.t 2>/dev/null &&                     \
+          $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then     \

                touch $@;                                                    \
        else                                                                 \
                mv $@.t $@;                                                  \
                touch $@;                                                    \
        else                                                                 \
                mv $@.t $@;                                                  \

diff --git a/doc/bison.1 b/doc/bison.1
index adb4344a67215f71754ede3a47f310cd554f145d..1d8ef3c81e807087a0f2b121cafb7b2e7a2993c6 100644 (file)
--- a/doc/bison.1
+++ b/doc/bison.1
@@ -163,8 +163,6 @@ disable the report
 Written by Robert Corbett and Richard Stallman.
 .SH "REPORTING BUGS"
 Report bugs to <bug\-bison@gnu.org>.
 Written by Robert Corbett and Richard Stallman.
 .SH "REPORTING BUGS"
 Report bugs to <bug\-bison@gnu.org>.

-.PP
-Id: ChangeLog,v 1.1748 2007/11/04 20:45:32 akim Exp

 .SH COPYRIGHT
 Copyright \(co 2007 Free Software Foundation, Inc.
 .br
 .SH COPYRIGHT
 Copyright \(co 2007 Free Software Foundation, Inc.
 .br