From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 1 Jun 2011 07:11:05 +0000 (-0400)
Subject: Use the latest autogen's new copyright template code
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abec8bb7dbf2e5bafff2902d077b30fcdd64319e;p=thirdparty%2Fntp.git

Use the latest autogen's new copyright template code

bk: 4de5e609RXB1msspqxMSbD-yXIxcvg
---

diff --git a/ChangeLog b/ChangeLog
index 5eee4e7f0f..2331e2b653 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Use the latest autogen's new copyright template code.
 (4.2.7p176) 2011/05/31 Released by Harlan Stenn <stenn@ntp.org>
 * sntp documentation cleanup.
 * autogen documentation template cleanup.
diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 881fc6c9fc..4ce126c819 100644
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -125,7 +125,7 @@ EXTRA_PROGRAMS = check_y2k ntpdsim keyword-gen
 noinst_DATA =	$(srcdir)/ntpd-opts.texi $(srcdir)/ntpd-opts.menu
 noinst_HEADERS = declcond.h
 run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)"	\
-		autogen -L ../sntp/include --writable
+		autogen -L ../sntp/include -L ../sntp/ag-tpl --writable
 std_def_list =							\
 	$(top_srcdir)/sntp/include/debug-opt.def		\
 	$(top_srcdir)/sntp/include/autogen-version.def 		\
diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 720457fe41..e90fc2e3b7 100644
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -27,7 +27,7 @@ BUILT_SOURCES=	ntpq-opts.c ntpq-opts.h
 man_MANS=	$(srcdir)/ntpq.1
 noinst_DATA=	$(srcdir)/ntpq-opts.texi $(srcdir)/ntpq-opts.menu
 run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)"	\
-		autogen -L ../sntp/include --writable
+		autogen -L ../sntp/include -L ../sntp/ag-tpl --writable
 std_def_list =							\
 	$(top_srcdir)/sntp/include/debug-opt.def		\
 	$(top_srcdir)/sntp/include/autogen-version.def 		\
diff --git a/ntpsnmpd/Makefile.am b/ntpsnmpd/Makefile.am
index fd215850fc..ecfec3d9a5 100644
--- a/ntpsnmpd/Makefile.am
+++ b/ntpsnmpd/Makefile.am
@@ -29,7 +29,7 @@ CLEANFILES=
 noinst_DATA=	$(srcdir)/ntpsnmpd-opts.texi $(srcdir)/ntpsnmpd-opts.menu
 man_MANS=	$(srcdir)/ntpsnmpd.1
 run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)"	\
-		autogen -L ../sntp/include --writable
+		autogen -L ../sntp/include -L ../sntp/ag-tpl --writable
 std_def_list =							\
 	$(top_srcdir)/sntp/include/debug-opt.def		\
 	$(top_srcdir)/sntp/include/autogen-version.def 		\
diff --git a/sntp/include/copyright.def b/sntp/include/copyright.def
index 171fd3e9a3..a63ec82cff 100644
--- a/sntp/include/copyright.def
+++ b/sntp/include/copyright.def
@@ -2,13 +2,9 @@
 
 copyright = {
     date  = "1970-2011";
-    owner = "David L. Mills and/or others.";
+    owner = "The University of Delaware, David L. Mills, and/or others";
     eaddr = "http://bugs.ntp.org, bugs@ntp.org";
-    type  = note;
-    text  = <<- _EndOfDoc_
-	See html/copyright.html
-
-	_EndOfDoc_;
+    type  = ntp;
 };
 
 long-opts;
diff --git a/util/Makefile.am b/util/Makefile.am
index 6bed13b9a2..67b4abce48 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -31,7 +31,7 @@ DISTCLEANFILES=	.version version.c
 noinst_DATA=	$(srcdir)/ntp-keygen-opts.texi $(srcdir)/ntp-keygen-opts.menu
 man_MANS=	$(srcdir)/ntp-keygen.1
 run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)"	\
-		autogen -L ../sntp/include --writable
+		autogen -L ../sntp/include -L ../sntp/ag-tpl --writable
 std_def_list =							\
 	$(top_srcdir)/sntp/include/debug-opt.def		\
 	$(top_srcdir)/sntp/include/autogen-version.def 		\