Remove spurious initial empty lines.

[bison.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index c3c7748b9110f577187f80f2823c92ec3eaad000..4b0abfa64a37221d0cf5a1d3f15703f56b0dffb3 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -2,8 +2,8 @@
 
 # Bootstrap this package from checked-out sources.
 
 
 # Bootstrap this package from checked-out sources.
 

-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation,
-# Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
+# 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


@@ -36,7 +36,7 @@ bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
 bt2=${bt}2
 
 usage() {
 bt2=${bt}2
 
 usage() {

-  echo >&2 "\
+  cat <<EOF

 Usage: $0 [OPTION]...
 Bootstrap this package from the checked-out sources.
 
 Usage: $0 [OPTION]...
 Bootstrap this package from the checked-out sources.
 


@@ -57,7 +57,7 @@ If the file bootstrap.conf exists in the current working directory, its
 contents are read as shell variables to configure the bootstrap.
 
 Running without arguments will suffice in most cases.
 contents are read as shell variables to configure the bootstrap.
 
 Running without arguments will suffice in most cases.

-"
+EOF

 }
 
 # Configuration.
 }
 
 # Configuration.


@@ -129,7 +129,7 @@ excluded_files=
 
 # File that should exist in the top directory of a checked out hierarchy,
 # but not in a distribution tarball.
 
 # File that should exist in the top directory of a checked out hierarchy,
 # but not in a distribution tarball.

-checkout_only_file=README-hacking
+checkout_only_file=HACKING

 
 # Whether to use copies instead of symlinks.
 copy=false
 
 # Whether to use copies instead of symlinks.
 copy=false


@@ -614,12 +614,6 @@ if test -f $mam_template; then
   done
 fi
 
   done
 fi
 

-# FIXME: Gnulib should be patched to add "/" in front of .gitignore entries
-# instead.  Anyway, this hack must be done before invoking autoconf so that
-# build-aux/git-version-gen doesn't think the version is dirty because
-# .gitignore isn't committed.
-grep -v '^GNUmakefile$' .gitignore > .gitignore~ && mv .gitignore~ .gitignore
-

 # Reconfigure, getting other files.
 
 for command in \
 # Reconfigure, getting other files.
 
 for command in \