Merge

bk: 3ed71ff74GB_AZ9LvgDYxsL6bBbr4g

diff --cc Makefile.am
index 9acb2e23e1fd9b170ab96332954ea87d90bbc9b6,f31fcc6b1664acf670821bb817f3653516f97781..12c8ad568eb8ffae0f04eee87c846beaa768c0cc
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -60,8 -61,8 +60,8 @@@ ETAGS_ARGS = Makefile.am configure.i
  # HMS: Keep .warning first, as that way it gets printed first.
  BUILT_SOURCES = .warning $(srcdir)/COPYRIGHT $(srcdir)/version
  
- $(srcdir)/COPYRIGHT: html/copyright.html
 -$(srcdir)/COPYRIGHT: $(srcdir)/html/copyright.htm
 -      ( echo "This file is automatically generated from html/copyright.htm" ; lynx -dump $(srcdir)/html/copyright.htm ) > $(srcdir)/COPYRIGHT.new && mv $(srcdir)/COPYRIGHT.new $(srcdir)/COPYRIGHT
++$(srcdir)/COPYRIGHT: $(srcdir)/html/copyright.html
 +      ( echo "This file is automatically generated from html/copyright.html" ; lynx -dump $(srcdir)/html/copyright.html ) > $(srcdir)/COPYRIGHT.new && mv $(srcdir)/COPYRIGHT.new $(srcdir)/COPYRIGHT
  
  # HMS: The next bit is still suboptimal.  If bk is present but this NTP
  # repo is not a bk repo, we'll get an error message from the prs command.