Minor fixes.

* mfd/main.c (parse_opt): Add missing break.
(cb_include_path): Fix use of improper variable
in MU_CFG_LIST branch.
* am/aggr.m4 (IU_CHECK_MEMBER): Remove improper use of dnl.
* doc/Makefile.am (check-builtins, check-mflib): Do not
split sed expressions over multiple lines: Makefile format
cannot handle it properly.
* doc/mailfromd.texi: Update.
* bootstrap: Do not apply `silentize' to gnu/gnulib.mk. Latest
gnulib takes care of it itself.

2 files changed, 2 insertions, 6 deletions

diff --git a/bootstrap b/bootstrap
index bf5909c..46a0964 100755
--- a/bootstrap
+++ b/bootstrap
@@ -507,7 +507,6 @@ slurp() {
           rm -f $dir/$gnulib_mk &&
           sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
         }
-        silentize $dir/$gnulib_mk
       elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
            version_controlled_file $dir $file; then
         echo "$0: $dir/$file overrides $1/$dir/$file"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 499c218..d1f1bd5 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -62,9 +62,7 @@ check-options:
 
 check-builtins:
         @check-docs.sh builtins \
-    '/MF_DEFUN/{s/[ \t]*MF_DEFUN *(\([a-zA-Z_][a-zA-Z0-9_]*\),.*/\1/p;\
-    s/[ \t]*MF_DEFUN_VARARGS\(_NO_PROM\)\? *(\([a-zA-Z_][a-zA-Z0-9_]*\),.*/\2/p;\
-    s/[ \t]*MF_DEFUN_CTYPE *(\([a-zA-Z_][a-zA-Z0-9_]*\))/\1/p}'\
+    '/MF_DEFUN/{s/[ \t]*MF_DEFUN *(\([a-zA-Z_][a-zA-Z0-9_]*\),.*/\1/p;s/[ \t]*MF_DEFUN_VARARGS\(_NO_PROM\)\? *(\([a-zA-Z_][a-zA-Z0-9_]*\),.*/\2/p;s/[ \t]*MF_DEFUN_CTYPE *(\([a-zA-Z_][a-zA-Z0-9_]*\))/\1/p}'\
     's/@deftypefnx\{0,1\} {Built-in Function} *[^ ][^ ]* *\([^ ]*\).*/\1/p' \
     $(top_srcdir)/mfd/bi_*.m4 -- \
        $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
@@ -72,8 +70,7 @@ check-builtins:
 
 check-mflib:
         @check-docs.sh "library functions" \
-    '/^[ \t]*func[ \t][ \t]*__/b;\
-     /^[ \t]*func/s/[ \t]*func[ \t][ \t]*\(.[^ \t(]*\).*/\1/p' \
+    '/^[ \t]*func[ \t][ \t]*__/b;/^[ \t]*func/s/[ \t]*func[ \t][ \t]*\(.[^ \t(]*\).*/\1/p' \
     's/@deftypefn {Library Function} *[^ ][^ ]* *\([^ ]*\).*/\1/p' \
     $(top_srcdir)/mflib/*.mf -- \
        $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \