make fetch

gnulib still hasn’t merged the maint.mk fixes in commits 7da7ecd0
and 7c62a0cd so those were put back by hand afterward.

diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh
index 29896ab28e2c8ae5ae7b0c3c053910a3b2c2c3e3..80b0a17368669b4f81b9e85e739fd94a19d44255 100755 (executable)
--- a/build-aux/gendocs.sh
+++ b/build-aux/gendocs.sh
@@ -424,7 +424,7 @@ d=`dirname $srcfile`
   # Omit patterns that do not expand to file names.
   pats=
 
-  if case `$MAKEINFO --version | sed -e 's/^[^0-9]*//' -e 1q` in \
+  if case `eval $MAKEINFO --version | sed -e 's/^[^0-9]*//' -e 1q` in \
        [1-6]* | 7.[01]*) false;; \
        *) true;; \
      esac \

diff --git a/maint.mk b/maint.mk
index db8932919c564d78bd9de7b48664d2577b955068..458f15adba3114de30cf7755b94ce795dbc83016 100644 (file)
--- a/maint.mk
+++ b/maint.mk
@@ -879,22 +879,22 @@ sc_obsolete_symbols:
 # Prohibit BSD4.3/SysV u_char, u_short, u_int and u_long usage.
 sc_unsigned_char:
        @prohibit=u''_char \
-       exclude='Prohibit BSD4\.3/SysV u_' \
+       exclude='Prohibit ' \
        halt='don'\''t use u''_char; instead use unsigned char' \
          $(_sc_search_regexp)
 sc_unsigned_short:
        @prohibit=u''_short \
-       exclude='Prohibit BSD4\.3/SysV u_' \
+       exclude='Prohibit ' \
        halt='don'\''t use u''_short; instead use unsigned short' \
          $(_sc_search_regexp)
 sc_unsigned_int:
        @prohibit=u''_int \
-       exclude='Prohibit BSD4\.3/SysV u_' \
+       exclude='Prohibit ' \
        halt='don'\''t use u''_int; instead use unsigned int' \
          $(_sc_search_regexp)
 sc_unsigned_long:
        @prohibit=u''_long \
-       exclude='Prohibit BSD4\.3/SysV u_' \
+       exclude='Prohibit ' \
        halt='don'\''t use u''_long; instead use unsigned long' \
          $(_sc_search_regexp)
 
@@ -1744,6 +1744,7 @@ web-manual:
        $(AM_V_GEN)test -z "$(manual_title)" \
          && { echo define manual_title in cfg.mk 1>&2; exit 1; } || :
        $(AM_V_at)cd '$(srcdir)/doc'; \
+         MAKEINFO="$(MAKEINFO)" \
          $(SHELL) ../$(_build-aux)/gendocs.sh $(gendocs_options_) \
             -o '$(abs_builddir)/doc/manual' \
             --email $(PACKAGE_BUGREPORT) $(PACKAGE) \