[svn-r11471] Purpose:

revision.

Description:
The copyright notice for Makefile(in) were fixed at the beginning of the files.
But they are now generated by automake and autoconf such that Gnu jams its
own copyright block at the beginning.

Solution:
Changed the rule such that the HDF5 copyright notice can be somewhere else
in the file as long as they are together as one paragraph.

Also added recognition of Makefile.am as a possible MAKEFILE type.

Platforms tested:
Tested by hand in heping.

1 files changed, 17 insertions, 17 deletions

diff --git a/bin/chkcopyright b/bin/chkcopyright
index c217743..4481e51 100755
--- a/bin/chkcopyright
+++ b/bin/chkcopyright
@@ -215,27 +215,27 @@ MAKE_FILE()
 {
     f=$1
     cat > ${COPYRIGHTFILE} << \EOF
-##
-## Copyright by the Board of Trustees of the University of Illinois.
-## All rights reserved.
-##
-## This file is part of HDF5.  The full HDF5 copyright notice, including
-## terms governing use, modification, and redistribution, is contained in
-## the files COPYING and Copyright.html.  COPYING can be found at the root
-## of the source code distribution tree; Copyright.html can be found at the
-## root level of an installed copy of the electronic HDF5 document set and
-## is linked from the top-level documents page.  It can also be found at
-## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
-## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
-##
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 EOF
     # Must use stdin for wc to prevent filename from popping up.
     nlines=`wc -l < ${COPYRIGHTFILE}| tr -d ' '`
-    head -${nlines} $f | $DIFF - ${COPYRIGHTFILE} >/dev/null 2>&1
+    morelines=`expr $nlines - 1`
+    sed -n -e "/^# Copyright by the Board of Trustees/,+${morelines}p" < $f > ${EXTRACTEDFILE}
+    $DIFF ${EXTRACTEDFILE} ${COPYRIGHTFILE} >/dev/null 2>&1
     if test $? -ne 0; then
 	# show the differences
 	echo ${f}:
-	head -${nlines} $f | $DIFF - ${COPYRIGHTFILE}
+	$DIFF ${EXTRACTEDFILE} ${COPYRIGHTFILE}
     fi
 }
 
@@ -271,11 +271,11 @@ while read file; do
     *.sh | *.sh.in )
 	SHELL_FILE ${file}
 	;;
-    *Makefile | *Makefile.in )
+    *Makefile | *Makefile.in | *Makefile.am )
 	MAKE_FILE ${file}
 	;;
     *CVS/* )
-	# Skip
+	# Ignore CVS control files.
 	continue
 	;;
     *)