From d1bf3f9e8fd59f6453a4b6c244f652778097eb68 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 22 Oct 2015 16:26:06 +1100
Subject: [PATCH] cleanup trailing whitespace

---
 bin/tests/Makefile.in                   | 2 +-
 bin/tests/system/fetchlimit/Makefile.in | 2 +-
 bin/tests/system/statistics/Makefile.in | 2 +-
 doc/xsl/Makefile.in                     | 2 +-
 lib/dns/tests/Makefile.in               | 4 ++--
 util/update_copyrights                  | 4 +++-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index 6cfff56aa4..f7cec65dca 100644
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -134,7 +134,7 @@ XSRCS =		adb_test.c \
 
 @BIND9_MAKE_RULES@
 
-# disable optimization for backtrace test to get the expected result	
+# disable optimization for backtrace test to get the expected result
 BTTEST_CFLAGS =	${BACKTRACECFLAGS} ${EXT_CFLAGS} ${ALL_CPPFLAGS} -g \
 		${ALWAYS_WARNINGS} ${STD_CWARNINGS} ${CWARNINGS}
 
diff --git a/bin/tests/system/fetchlimit/Makefile.in b/bin/tests/system/fetchlimit/Makefile.in
index 5540f36318..fffd969454 100644
--- a/bin/tests/system/fetchlimit/Makefile.in
+++ b/bin/tests/system/fetchlimit/Makefile.in
@@ -25,7 +25,7 @@ CINCLUDES =	${ISC_INCLUDES}
 CDEFINES =
 CWARNINGS =
 
-DNSLIBS =	
+DNSLIBS =
 ISCLIBS =	.
 
 DNSDEPLIBS =
diff --git a/bin/tests/system/statistics/Makefile.in b/bin/tests/system/statistics/Makefile.in
index 7ac61b39d8..8cbcf2c76a 100644
--- a/bin/tests/system/statistics/Makefile.in
+++ b/bin/tests/system/statistics/Makefile.in
@@ -27,7 +27,7 @@ CINCLUDES =	${ISC_INCLUDES}
 CDEFINES =
 CWARNINGS =
 
-DNSLIBS =	
+DNSLIBS =
 ISCLIBS =	.
 
 DNSDEPLIBS =
diff --git a/doc/xsl/Makefile.in b/doc/xsl/Makefile.in
index ed925ca41c..da9881477d 100644
--- a/doc/xsl/Makefile.in
+++ b/doc/xsl/Makefile.in
@@ -23,4 +23,4 @@ TARGETS =
 
 distclean::
 	rm -f isc-docbook-chunk.xsl isc-docbook-html.xsl \
-	      isc-manpage.xsl isc-notes-html.xsl 
+	      isc-manpage.xsl isc-notes-html.xsl
diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index 3aed4062f4..7d87535beb 100644
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -136,7 +136,7 @@ nsec3_test@EXEEXT@: nsec3_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			nsec3_test.@O@ dnstest.@O@ ${DNSLIBS} \
 				${ISCLIBS} ${LIBS}
-				
+
 rdataset_test@EXEEXT@: rdataset_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
 			rdataset_test.@O@ dnstest.@O@ ${DNSLIBS} \
@@ -169,4 +169,4 @@ clean distclean::
 	rm -f ${TARGETS}
 	rm -f atf.out
 	rm -f testdata/master/master12.data testdata/master/master13.data \
-		testdata/master/master14.data 
+		testdata/master/master14.data
diff --git a/util/update_copyrights b/util/update_copyrights
index d8aad3c1a7..e85473c61d 100644
--- a/util/update_copyrights
+++ b/util/update_copyrights
@@ -559,7 +559,9 @@ foreach $file (keys %file_types) {
 				$body = "$body$_";
 			}
 			$_ = $body;
-		} elsif ($type eq "SGML" && $sysyears =~ /$this_year/) {
+		} elsif (($type eq "SGML" || $type eq "HTML" ||
+			  $type eq "MAKE") &&
+		         $sysyears =~ /$this_year/) {
 			my $body = "";
 			while (<SOURCE>) {
 			# Remove trailing white space.