[Git][NTPsec/ntpsec][master] Rename option to set HTML installation dir, and document it better.

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
08c62a5f by Eric S. Raymond at 2016-10-04T07:17:22-04:00
Rename option to set HTML installation dir, and document it better.

- - - - -


3 changed files:

- docs/wscript
- wafhelpers/configure.py
- wafhelpers/options.py


Changes:

=====================================
docs/wscript
=====================================
--- a/docs/wscript
+++ b/docs/wscript
@@ -35,9 +35,9 @@ def build(ctx):
 		target		= extra
 	)
 
-	# Install docs
-	if ctx.env.PATH_DOC:
-		install_prefix = ctx.env.PATH_DOC
+	# Install HTML
+	if ctx.env.HTMLDIR:
+		install_prefix = ctx.env.HTMLDIR
 	else:
 		install_prefix = "%s/share/ntpsec/docs/" % ctx.env.PREFIX
 


=====================================
wafhelpers/configure.py
=====================================
--- a/wafhelpers/configure.py
+++ b/wafhelpers/configure.py
@@ -87,7 +87,7 @@ def cmd_configure(ctx, config):
                 ctx.env.ASCIIDOC_FLAGS = ["-f", "%s/docs/asciidoc.conf" % ctx.srcnode.abspath()]
                 ctx.env.ENABLE_DOC_ONLY = ctx.options.enable_doc_only
                 ctx.env.ENABLE_DOC_USER = ctx.options.enable_doc
-                ctx.env.PATH_DOC = ctx.options.path_doc
+                ctx.env.HTMLDIR = ctx.options.htmldir
 
         # XXX: conditionally build this with --disable-man?  Should it build without docs enabled?
         ctx.env.A2X_FLAGS = ["--format", "manpage", "--asciidoc-opts=--conf-file=%s/docs/asciidoc.conf" % ctx.srcnode.abspath()]


=====================================
wafhelpers/options.py
=====================================
--- a/wafhelpers/options.py
+++ b/wafhelpers/options.py
@@ -53,7 +53,7 @@ def options_cmd(ctx, config):
 	grp.add_option('--enable-doc-only', action='store_true', default=False, help="Only build NTP documentation")
 	grp.add_option('--enable-a2x-xmllint', action='store_true', default=False, help="Build NTP documentation with a2x XML lint")
 	grp.add_option('--disable-manpage', action='store_true', default=False, help="Disable Manpage building.")
-	grp.add_option('--path-doc', type='string', action='store', default=None, help="Force doc install directory.")
+	grp.add_option('--htmldir', type='string', action='store', default=None, help="Force HTML installation directory.")
 
 	grp = ctx.add_option_group("Not for general use")
 	grp.add_option('--build-snapshot', action='store_true', default=False, help="Generate source snapshot.")



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/08c62a5f9efc63e7e3ee8755156b2ab651882a02
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20161004/1cf6396c/attachment.html>