Clean up recent patches a little.

[bison.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index 1a0df2e2d3ce0f9db1d3e8de666ffa0da96c4d7b..c7596c178994b2e6138791909345254a5e4e2362 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,36 +1,28 @@
 # Bootstrap configuration.
 
 # Bootstrap configuration.
 

-# Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.

 
 

-# This program is free software; you can redistribute it and/or modify
+# 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
 # it under the terms of the GNU General Public License as published by

-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#

 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-
+#

 # You should have received a copy of the GNU General Public License
 # You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 # gnulib modules used by this package.
 gnulib_modules='
 
 # gnulib modules used by this package.
 gnulib_modules='

-       argmatch config-h c-strcase configmake
-       dirname error extensions fopen-safer
-       getopt gettext hash inttypes javacomp-script javaexec-script malloc
-       mbswidth obstack quote quotearg stdbool stpcpy strerror strtoul
-       strverscmp unistd unistd-safer unlocked-io verify xalloc xalloc-die
-       xstrndup
-'
-
-# Any gnulib files needed that are not in modules.
-gnulib_files='
-       m4/warning.m4
+  announce-gen argmatch config-h c-strcase configmake dirname error
+  extensions fopen-safer gendocs getopt gettext git-version-gen
+  gnumakefile hash inttypes javacomp-script javaexec-script malloc
+  mbswidth obstack quote quotearg stdbool stpcpy strerror strtoul
+  strverscmp unistd unistd-safer unlocked-io unsetenv verify warnings
+  xalloc xalloc-die xstrndup

 '
 
 # Additional xgettext options to use.  Use "\\\newline" to break lines.
 '
 
 # Additional xgettext options to use.  Use "\\\newline" to break lines.


@@ -68,3 +60,7 @@ excluded_files='
     m4/visibility.m4
     m4/xsize.m4
 '
     m4/visibility.m4
     m4/xsize.m4
 '

+
+# In directories like lib/, m4/, and po/, generate both these files because we
+# still try to support CVS emulation.
+vc_ignore='.cvsignore .gitignore'