From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 30 May 2003 09:10:15 +0000 (-0400)
Subject: Merge
X-Git-Tag: NTP_4_1_80_RC1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ba7ee8298dfd80628b9b6f8e046dc5d93e42f67;p=thirdparty%2Fntp.git

Merge

bk: 3ed71ff74GB_AZ9LvgDYxsL6bBbr4g
---

5ba7ee8298dfd80628b9b6f8e046dc5d93e42f67
diff --cc Makefile.am
index 9acb2e23e,f31fcc6b1..12c8ad568
--- a/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.