Use the latest autogen's new copyright template code

bk: 4de5e609RXB1msspqxMSbD-yXIxcvg

diff --git a/ChangeLog b/ChangeLog
index 5eee4e7f0f3ff8c6ab3bed63cb5c77e245abb70a..2331e2b6537d4a1a929a70289de79bf4859fea18 100644 (file)
--- 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 881fc6c9fcce9a3a8f31940901da0f03ea032a27..4ce126c819bd32e1a2dc3623476919bc26379563 100644 (file)
--- 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 720457fe4163d0b0b611809f12f4f5d1b7551a2b..e90fc2e3b7cd3870e2177fe1f0fcef1dd8ccba08 100644 (file)
--- 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 fd215850fc400c64e11e175e5a89b4363f7d78f9..ecfec3d9a5547d9739514eb7418cffe04ab0d984 100644 (file)
--- 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 171fd3e9a39bc3c009e9622220bcfa9dc39a1bdf..a63ec82cffbe9ab5a1dc93d5651ec21e20ec1a4a 100644 (file)
--- 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 6bed13b9a29d8949cbf7e50146a34594fb8dc643..67b4abce481685cbe0fe675cd92ec960b1731766 100644 (file)
--- 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          \