scan-skel.l: consider m4 notes as related to "complaint" errors

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index e90cf12d4d0e01da3e784bf38194f4528f5701b8..cddc571b6dedd3462c28b20387c4ca22611a298e 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -25,6 +25,7 @@ gnulib_modules='
   gpl-3.0 hash inttypes isnan javacomp-script
   javaexec-script ldexpl malloc-gnu
   mbswidth
+  non-recursive-gnulib-prefix-hack
   obstack
   obstack-printf
   perror progname
@@ -48,9 +49,8 @@ gnulib_modules='
 XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --from-code=UTF-8\\\
  --flag=asprintf:2:c-format\\\
- --flag=complain:2:c-format\\\
- --flag=complain_at:3:c-format\\\
- --flag=complain_at_indent:4:c-format\\\
+ --flag=complain:3:c-format\\\
+ --flag=complain_indent:4:c-format\\\
  --flag=unexpected_end:2:c-format\\\
 '
 XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\
@@ -79,7 +79,7 @@ gnulib_tool_option_extras='--symlink --makefile-name=gnulib.mk'
 bootstrap_post_import_hook()
 {
   # Massage lib/gnulib.mk before using it later in the bootstrapping process.
-  etc/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk
+  build-aux/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk
 
   # Ensure that ChangeLog exists, for automake.
   test -f ChangeLog || touch ChangeLog