diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-02-16 18:53:09 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-02-16 18:53:09 +0100 |
| commit | 3614a17db7efbc5ca7929ec66dfe278e94930b68 (patch) | |
| tree | cc17171ac8366d2d2b80c7b7232d0294aeee66aa | |
| parent | f76cb63c8c775daa81ecad00b0a3ac6019fbebfe (diff) | |
| download | automake-3614a17db7efbc5ca7929ec66dfe278e94930b68.tar.gz | |
update-copyright: don't touch COPYING and INSTALL
Reported by Peter Rosin.
* update-copyright: Also exclude the COPYING and INSTALL files
found in the top-level directory.
* COPYING, INSTALL: Revert update of copyright years done in
today's commit 'v1.11-1948-g641a5a4'.
| -rw-r--r-- | COPYING | 2 | ||||
| -rw-r--r-- | INSTALL | 3 | ||||
| -rw-r--r-- | Makefile.am | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989-2012 Free Software Foundation, Inc., + Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -1,7 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994-2012 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/Makefile.am b/Makefile.am index 7c49ab6e6..b11e8fd08 100644 --- a/Makefile.am +++ b/Makefile.am @@ -379,6 +379,6 @@ update-copyright: $(AM_V_GEN)excluded_re=`echo $(FETCHFILES) \ | sed -e 's|^|lib/|' -e 's| | lib/|g' -e 's, ,|,g'`; \ $(GIT) ls-files \ - | grep -Ev '/(COPYING|INSTALL)' \ + | grep -Ev '^(lib/)?(COPYING|INSTALL)$$' \ | grep -Ev "^($$excluded_re)$$" \ | $(update_copyright_env) xargs $(srcdir)/lib/$@ |