bug-bison
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Bison 3.5.92 on Haiku


From: Akim Demaille
Subject: Re: Bison 3.5.92 on Haiku
Date: Fri, 8 May 2020 09:44:11 +0200

The CI revealed I broke the case where there is no bison.1 yet.

commit 53bfc7df946be2da212025c28574d9a7fd38efa5
Author: Akim Demaille <address@hidden>
Date:   Fri May 8 08:18:12 2020 +0200

    doc: fix the generation of the man page
    
    When there is no bison.1 at all, the procedure fails.
    
    * doc/local.mk (bison.1): Be robust to cold starts.

diff --git a/doc/local.mk b/doc/local.mk
index aaa89ec1..ab5b7454 100644
--- a/doc/local.mk
+++ b/doc/local.mk
@@ -131,7 +131,7 @@ dist_man_MANS = $(top_srcdir)/%D%/bison.1
 EXTRA_DIST += $(dist_man_MANS:.1=.x)
 MAINTAINERCLEANFILES += $(dist_man_MANS)
 
-# Differences to ignore when comparing the man page (the date).
+# Differences to ignore when comparing man pages (the date).
 remove_time_stamp = \
   sed 's/^\(\.TH[^"]*"[^"]*"[^"]*\)"[^"]*"/\1/'
 
@@ -144,15 +144,15 @@ endif
 # have the real thing, so if there's a .git directory, fail hard.
 #
 # We shouldn't need this, but on some OS the timestamps in the tarball
-# leaves us no choice.  See
+# leave us no choice.  See
 # https://lists.gnu.org/r/bug-bison/2020-05/msg00055.html.
 $(top_srcdir)/%D%/bison.1: $(MAN_DEPS)
        $(AM_V_GEN)if $(HELP2MAN) --version >/dev/null 2>&1; then       \
          $(HELP2MAN)                                                   \
            --include=$(top_srcdir)/%D%/bison.x                         \
            --output=$@.tmp tests/bison &&                              \
-         $(remove_time_stamp) $@     >$@a.tmp 2>/dev/null &&           \
-         $(remove_time_stamp) $@.tmp >$@b.tmp 2>/dev/null &&           \
+         { $(remove_time_stamp) $@     >$@a.tmp || true; } &&          \
+           $(remove_time_stamp) $@.tmp >$@b.tmp &&                     \
          if diff $@a.tmp $@b.tmp >/dev/null 2>&1; then                 \
            touch $@;                                                   \
          else                                                          \




reply via email to

[Prev in Thread] Current Thread [Next in Thread]