[Bug 2098] Install DLM's HTML documentation

bk: 50aa0ebc-2FphzuIkcP2fp-aIZpq6w

diff --git a/ChangeLog b/ChangeLog
index ae0e37ad34075bfbf2ac01a78118bb377f0e1f88..c8bed171f1d431b04b4e5f63a63bd8a5897f0de7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 * Reinstate doc fix to authentic.html from Mike T.
 * [Bug 1223] cleanup for rlimit changes.
+* [Bug 2098] Install DLM's HTML documentation.
 * [Bug 2306] Added user-mode/loop-back PPS API provider for Win32
 (4.2.7p323) 2012/11/18 Released by Harlan Stenn <stenn@ntp.org>
 * html/ updates from Dave Mills.

diff --git a/Makefile.am b/Makefile.am
index 0c5c996b733dd6a73a4af77c54bc058e5b2899db..3a6102eb75f75979d6d2d27ef3b150db3331804b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,6 +90,13 @@ sntp/built-sources-only: FRC.sntp
 dist-hook:
        @find $(distdir) -type d -name SCCS -print | xargs rm -rf
 
+install-data-local:
+       ( cd $(srcdir) && tar cf - `find html -type f | grep -v SCCS`) \
+               | ( cd $(DESTDIR)$(htmldir) && tar xvf - )
+
+uninstall-local:
+               rm -rf $(DESTDIR)$(htmldir)/html
+
 .gcc-warning:
        @echo "Compiling with GCC now generates lots of new warnings."
        @echo " "

diff --git a/configure.ac b/configure.ac
index 0571a284d9c8219d4b99cd19c79914bbfd1706ae..253d657dd1089b5826e156a7203006ffeafdca78 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4237,7 +4237,7 @@ AC_CONFIG_FILES([kernel/sys/Makefile])
 AC_CONFIG_FILES([libntp/Makefile])
 AC_CONFIG_FILES([libparse/Makefile])
 AC_CONFIG_FILES([ntpd/Makefile])
-AC_CONFIG_FILES([ntpd/complete.conf],  [sed -i.old -e '/^rlimit$/d' ntpd/complete.conf])
+AC_CONFIG_FILES([ntpd/complete.conf],  [sed -i.old -e '/^rlimit$/d' ntpd/complete.conf && rm ntpd/complete.conf.old])
 AC_CONFIG_FILES([ntpdate/Makefile])
 AC_CONFIG_FILES([ntpdc/Makefile])
 AC_CONFIG_FILES([ntpdc/nl.pl],         [chmod +x ntpdc/nl.pl])