style: comment changes

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index c8aac8dd86836db668641500c5577c3d4cfe0612..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


@@ -17,16 +17,30 @@
 
 # gnulib modules used by this package.
 gnulib_modules='
 
 # gnulib modules used by this package.
 gnulib_modules='

-  announce-gen argmatch assert calloc-posix close closeout config-h c-strcase
-  configmake dirname error extensions fdl fopen-safer gendocs getopt-gnu
+  argmatch assert calloc-posix close closeout config-h c-strcase
+  configmake
+  dirname
+  error extensions fdl fopen-safer
+  getopt-gnu

   gettext git-version-gen gitlog-to-changelog
   gpl-3.0 hash inttypes isnan javacomp-script
   gettext git-version-gen gitlog-to-changelog
   gpl-3.0 hash inttypes isnan javacomp-script

-  javaexec-script ldexpl maintainer-makefile malloc-gnu mbschr mbsrchr
-  mbswidth obstack perror pipe-posix quote quotearg realloc-posix
+  javaexec-script ldexpl malloc-gnu
+  mbswidth
+  non-recursive-gnulib-prefix-hack
+  obstack
+  obstack-printf
+  perror progname
+  quote quotearg
+  readme-release
+  realloc-posix

   spawn-pipe stdbool stpcpy strdup-posix strerror strtoul strverscmp
   spawn-pipe stdbool stpcpy strdup-posix strerror strtoul strverscmp

-  sysexits

   unistd unistd-safer unlocked-io update-copyright unsetenv verify
   unistd unistd-safer unlocked-io update-copyright unsetenv verify

-  warnings xalloc xalloc-die xstrndup
+  warnings
+  xalloc
+  xalloc-die
+  xconcat-filename
+  xmemdup0
+  xstrndup

 
   fprintf-posix printf-posix snprintf-posix sprintf-posix
   vsnprintf-posix vsprintf-posix
 
   fprintf-posix printf-posix snprintf-posix sprintf-posix
   vsnprintf-posix vsprintf-posix


@@ -36,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:1:c-format --flag=complain_at:2:c-format\\\
- --flag=fatal:1:c-format --flag=fatal_at:2:c-format\\\
- --flag=warn:1:c-format  --flag=warn_at:2: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'\\\


@@ -67,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


@@ -78,6 +91,8 @@ bootstrap_epilogue()
   # Make sure we don't need src/bison, which usually doesn't exist at
   # the time of a bootstrap.
   touch src/parse-gram.[ch]
   # Make sure we don't need src/bison, which usually doesn't exist at
   # the time of a bootstrap.
   touch src/parse-gram.[ch]

+
+  perl -pi -e "s/\@PACKAGE\@/$package/g" README-release

 }
 
 # Keep our bootstrap script in sync with gnulib's.  If we ever need to
 }
 
 # Keep our bootstrap script in sync with gnulib's.  If we ever need to


@@ -85,4 +100,4 @@ bootstrap_epilogue()
 # the bootstrap entry from the file .x-update-copyright, and add any
 # needed copyright years to the copyright statement in the bootstrap
 # script.
 # the bootstrap entry from the file .x-update-copyright, and add any
 # needed copyright years to the copyright statement in the bootstrap
 # script.

-# FIXME: temporary bootstrap_sync=true
+bootstrap_sync=true