maint: post-release administrivia

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index e90cf12d4d0e01da3e784bf38194f4528f5701b8..c58470e28b448e481dad64d7fd7c0b91e0c33739 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
 # Bootstrap configuration.
 

-# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.

 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -20,11 +20,13 @@ gnulib_modules='
   argmatch assert calloc-posix close closeout config-h c-strcase
   configmake
   dirname
   argmatch assert calloc-posix close closeout config-h c-strcase
   configmake
   dirname

-  error extensions fdl fopen-safer getopt-gnu
+  error extensions fdl fopen-safer
+  getopt-gnu

   gettext git-version-gen gitlog-to-changelog
   gpl-3.0 hash inttypes isnan javacomp-script
   javaexec-script ldexpl malloc-gnu
   mbswidth
   gettext git-version-gen gitlog-to-changelog
   gpl-3.0 hash inttypes isnan javacomp-script
   javaexec-script ldexpl malloc-gnu
   mbswidth

+  non-recursive-gnulib-prefix-hack

   obstack
   obstack-printf
   perror progname
   obstack
   obstack-printf
   perror progname


@@ -48,9 +50,8 @@ gnulib_modules='
 XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --from-code=UTF-8\\\
  --flag=asprintf:2:c-format\\\
 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'\\\
  --flag=unexpected_end:2:c-format\\\
 '
 XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\


@@ -79,7 +80,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.
 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
 
   # Ensure that ChangeLog exists, for automake.
   test -f ChangeLog || touch ChangeLog