From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 17 Sep 2012 10:11:50 +0000 (-0400)
Subject: [Bug 2262] Install html docs in $htmldir
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b78c9fad5d8071c0b4d3b5ba17de2fcbced258d2;p=thirdparty%2Fntp.git

[Bug 2262] Install html docs in $htmldir

bk: 5056f766uj7HV-uuWqnVC4WAI63HAg
---

diff --git a/ChangeLog b/ChangeLog
index 7b980714df..24e56223e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2262] Install html docs in $htmldir.
 (4.2.7p306) 2012/09/15 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 752] ToS cleanup from Mike Tatarinov.
 (4.2.7p305) 2012/09/15 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index 0cd3a0f870..a084382980 100644
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -51,14 +51,19 @@ man_MANS=	ntpdc.$(NTPDC_MS)
 ##info_TEXINFOS=	ntpdc.texi
 ##ntpdc_TEXINFOS=	ntpdc-opts.texi
 
+html_DATA=				\
+	$(srcdir)/ntpdc.html		\
+	$(NULL)
+
 noinst_DATA=				\
 	$(srcdir)/invoke-ntpdc.menu	\
 	$(srcdir)/invoke-ntpdc.texi	\
-	$(srcdir)/ntpdc.html		\
 	$(srcdir)/ntpdc.man.in		\
 	$(srcdir)/ntpdc.mdoc.in		\
 	$(NULL)
 
+install-data-local: install-html
+
 run_ag=		cd $(srcdir) &&	env PATH="$(abs_builddir):$(PATH)"	\
 		autogen -L ../sntp/include -L ../sntp/ag-tpl --writable
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index b0e76e2e93..8b629292f0 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -22,6 +22,10 @@ bin_SCRIPTS =	$(NTP_WAIT_DB) $(NTPTRACE_DB)
 libexec_SCRIPTS =	$(NTP_WAIT_DL) $(NTPTRACE_DL)
 sbin_SCRIPTS =	$(NTP_WAIT_DS) $(NTPTRACE_DS)
 
+html_DATA=				\
+	$(srcdir)/ntp-wait.html		\
+	$(NULL)
+
 noinst_SCRIPTS =		\
 	calc_tickadj		\
 	checktime		\
@@ -37,11 +41,12 @@ noinst_SCRIPTS =		\
 noinst_DATA=				\
 	$(srcdir)/invoke-ntp-wait.menu	\
 	$(srcdir)/invoke-ntp-wait.texi	\
-	$(srcdir)/ntp-wait.html		\
 	$(srcdir)/ntp-wait.man.in	\
 	$(srcdir)/ntp-wait.mdoc.in	\
 	$(NULL)
 
+install-data-local: install-html
+
 EXTRA_DIST =			\
 	check--help		\
 	checkChangeLog		\