From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 19 Nov 2012 10:49:32 +0000 (-0800)
Subject: [Bug 2098] Install DLM's HTML documentation
X-Git-Tag: NTP_4_2_7P324~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3d27f3f728e6eee43a549a5fcf68effb63839c3;p=thirdparty%2Fntp.git

[Bug 2098] Install DLM's HTML documentation

bk: 50aa0ebc-2FphzuIkcP2fp-aIZpq6w
---

diff --git a/ChangeLog b/ChangeLog
index ae0e37ad3..c8bed171f 100644
--- 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 0c5c996b7..3a6102eb7 100644
--- 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 0571a284d..253d657dd 100644
--- 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])