[ntpsec commit] Repair build, broken in ' Simplify and correct man-page generation.'

Eric S. Raymond esr at ntpsec.org
Mon Oct 19 23:44:26 UTC 2015


Module:    ntpsec
Branch:    master
Commit:    0a8d80246fb7e1e7d78a744ea46618e34e22e461
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=0a8d80246fb7e1e7d78a744ea46618e34e22e461

Author:    Eric S. Raymond <esr at thyrsus.com>
Date:      Mon Oct 19 19:43:20 2015 -0400

Repair build, broken in 'Simplify and correct man-page generation.'

Move ntptime to its own directory.

---

 {util => ntptime}/ntptime-man.txt |  0
 {util => ntptime}/ntptime.c       |  0
 util/wscript                      |  3 ---
 wscript                           | 24 +++++++++++++-----------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/util/ntptime-man.txt b/ntptime/ntptime-man.txt
similarity index 100%
rename from util/ntptime-man.txt
rename to ntptime/ntptime-man.txt
diff --git a/util/ntptime.c b/ntptime/ntptime.c
similarity index 100%
rename from util/ntptime.c
rename to ntptime/ntptime.c
diff --git a/util/wscript b/util/wscript
index b84809e..2462396 100644
--- a/util/wscript
+++ b/util/wscript
@@ -6,9 +6,6 @@ def build(ctx):
 
 	util = ['hist', 'propdelay', 'sht', 'tg2']
 
-	if ctx.env.PLATFORM_TARGET != "freebsd": # XXX: fix this using a test in configure().
-		util += ["ntptime"]
-
 	for name in util:
 		ctx(
 			target		= name,
diff --git a/wscript b/wscript
index b0a9e8e..30f5af9 100644
--- a/wscript
+++ b/wscript
@@ -103,6 +103,8 @@ def build(ctx):
 #	ctx.recurse("ntpfrob")
 	ctx.recurse("ntpq")
 	ctx.recurse("ntpkeygen") 
+	#if ctx.env.PLATFORM_TARGET != "freebsd": # XXX: fix this using a test in configure().
+	#	ctx.recurse("ntptime")
 	ctx.recurse("util")
 #	ctx.recurse("tests")
 
@@ -121,22 +123,22 @@ def build(ctx):
 	)
 
 	man_sources = [
-		"ntpkeygen/ntpkeygen-man.txt",
 		"ntpd/ntpd-man.txt",
-		"ntpq/ntpq-man.txt",
+		"ntpdig/ntpdig-man.txt",
+		"ntpfrob/ntpfrob-man.txt",
+		"ntpkeygen/ntpkeygen-man.txt",
 		"ntpleapfetch/ntpleapfetch-man.txt",
-		"scripts/ntpwait/ntpwait-man.txt",
+		"ntpq/ntpq-man.txt",
+		"ntptime/ntptime-man.txt",
 		"scripts/ntpsweep/ntpsweep-man.txt",
 		"scripts/ntptrace/ntptrace-man.txt",
-		"ntpdig/ntpdig-man.txt",
-		"ntpfrob/ntpfrob-man.txt",
-		"util/ntptime-man.txt",
+		"scripts/ntpwait/ntpwait-man.txt",
 	]
 
-	//ctx(
-	//	features    = "subst",
-	//	source      = subst_files,
-	//	target	    = [x.replace(".in", "") for x in subst_files],
-	//)
+	#ctx(
+	#	features    = "subst",
+	#	source      = subst_files,
+	#	target	    = [x.replace(".in", "") for x in subst_files],
+	#)
 
 # end



More information about the vc mailing list