Options to control option handling in file lists.

[chaz/tar] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index 6255ba97098a345829eefad46b5d84178ec36adb..8e9e3c04cf59b4314dcf3b0f5febc4fc8ba77195 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,25 +1,24 @@
 # Bootstrap configuration for GNU tar.
 
-# Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright 2006-2009, 2013-2014 Free Software Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
+# This file is part of GNU tar.
+
+# GNU tar is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, 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,
+# GNU tar 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
-# 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/>.
 
 source_base=gnu
 gnulib_name=libgnu
-gnulib_mk=Makefile.am
 
 # We don't need these modules, even though gnulib-tool mistakenly
 # includes them because of gettext dependencies.
@@ -68,7 +67,7 @@ fi
 test -d m4 || mkdir m4
 test -d $source_base || mkdir $source_base
 
-cat > ChangeLog <<EOT
+test -f ChangeLog || cat > ChangeLog <<EOT
 This file is a placeholder. It will be replaced with the actual ChangeLog
 by make dist.  Run make ChangeLog if you wish to create it earlier.
 EOT