From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 28 Dec 2010 08:16:01 +0000 (-0500)
Subject: Create and use scripts/check--help when generating .texi files
X-Git-Tag: NTP_4_2_7P104~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e85934ff44a28f9f601b1261a4db802d62b6990;p=thirdparty%2Fntp.git

Create and use scripts/check--help when generating .texi files

bk: 4d199cc18CO1YiHnwEf3sCT5Vw4I7g
---

diff --git a/ChangeLog b/ChangeLog
index 9edc68e38..143e78c55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 ---
 
+* Create and use scripts/check--help when generating .texi files.
 * Update bk triggers for the bk-5 release.
+
 ---
 (4.2.6p3-RC12) 2010/12/25 Released by Harlan Stenn <stenn@ntp.org>
 
diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 251836b36..144371aaa 100644
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -248,6 +248,7 @@ $(srcdir)/ntpd-opts.menu: $(srcdir)/ntpd-opts.texi
 	
 $(srcdir)/ntpd-opts.texi: $(srcdir)/ntpd-opts.def $(srcdir)/ntpdbase-opts.def $(std_def_list)
 	$(run_ag) -Taginfo.tpl -DLEVEL=section ntpd-opts.def
+	$(top_srcdir)/scripts/check--help $@
 
 $(PROGRAMS): $(LDADD)
 
diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index 4c9a7f4c2..00aeffb80 100644
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -48,6 +48,7 @@ $(srcdir)/ntpdc-opts.menu: $(srcdir)/ntpdc-opts.texi
 	
 $(srcdir)/ntpdc-opts.texi: $(srcdir)/ntpdc-opts.def $(std_def_list)
 	$(run_ag) -Taginfo.tpl -DLEVEL=section ntpdc-opts.def
+	$(top_srcdir)/scripts/check--help $@
 
 ntpdc_SOURCES = ntpdc.c ntpdc_ops.c ntpdc-opts.c ntpdc-opts.h
 
diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 5d259b9a8..735880bbb 100644
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -49,6 +49,7 @@ $(srcdir)/ntpq-opts.menu: $(srcdir)/ntpq-opts.texi
 	
 $(srcdir)/ntpq-opts.texi: $(srcdir)/ntpq-opts.def $(std_def_list)
 	$(run_ag) -Taginfo.tpl -DLEVEL=section ntpq-opts.def
+	$(top_srcdir)/scripts/check--help $@
 
 $(PROGRAMS): $(LDADD)
 
diff --git a/ntpsnmpd/Makefile.am b/ntpsnmpd/Makefile.am
index 80a54873f..168de2787 100644
--- a/ntpsnmpd/Makefile.am
+++ b/ntpsnmpd/Makefile.am
@@ -48,6 +48,7 @@ $(srcdir)/ntpsnmpd-opts.menu: $(srcdir)/ntpsnmpd-opts.texi
 	
 $(srcdir)/ntpsnmpd-opts.texi: $(srcdir)/ntpsnmpd-opts.def $(std_def_list)
 	$(run_ag) -Taginfo.tpl -DLEVEL=section ntpsnmpd-opts.def
+	$(top_srcdir)/scripts/check--help $@
 
 include $(top_srcdir)/bincheck.mf
 include $(top_srcdir)/depsver.mf
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 0246f2a77..afcfa77a4 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -8,6 +8,7 @@ endif
 
 noinst_SCRIPTS =		\
 	calc_tickadj		\
+	check--help		\
 	checktime		\
 	freq_adj		\
 	html2man		\
diff --git a/scripts/check--help b/scripts/check--help
new file mode 100755
index 000000000..b17da0508
--- /dev/null
+++ b/scripts/check--help
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+# Look at the file specified in $1 to see if it contains 'no --help'.
+# If it does:
+# - Squawk
+# - rename the file to ($1)-
+# - exit with a non-zero status.
+# otherwise:
+# - exit with a 0 status.
+
+if ! test -f $1
+then
+	echo "$0: $1 is not a regular file!" 2>&3
+	exit 1
+fi
+
+if grep -q 'no --help' $1
+then
+	echo "$0: $1 contains 'no --help'!" 2>&3
+	mv ${1} ${1}-
+	exit 1
+fi
diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 40ca5ac8b..f6d9f77c1 100644
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -178,6 +178,7 @@ $(srcdir)/sntp-opts.menu: $(srcdir)/sntp-opts.texi
 	
 $(srcdir)/sntp-opts.texi: $(srcdir)/sntp-opts.def $(srcdir)/version.def $(srcdir)/../include/copyright.def
 	$(run_ag) -Taginfo.tpl -DLEVEL=section sntp-opts.def
+	$(top_srcdir)/scripts/check--help $@
 
 $(srcdir)/sntp.html: $(srcdir)/sntp-opts.menu $(srcdir)/sntp-opts.texi $(srcdir)/sntp.texi $(srcdir)/version.texi
 	cd $(srcdir) && ( makeinfo --force --html --no-split -o sntp.html sntp.texi || true )
diff --git a/util/Makefile.am b/util/Makefile.am
index fff330329..c5d5d66c4 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -52,6 +52,7 @@ $(srcdir)/ntp-keygen-opts.menu: $(srcdir)/ntp-keygen-opts.texi
 	
 $(srcdir)/ntp-keygen-opts.texi: $(srcdir)/ntp-keygen-opts.def $(std_def_list)
 	$(run_ag) -Taginfo.tpl -DLEVEL=section ntp-keygen-opts.def
+	$(top_srcdir)/scripts/check--help $@
 
 
 jitter_SOURCES=	jitter.c jitter.h