summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2013-10-06 19:17:20 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2013-10-06 19:17:20 (GMT)
commitb64a70d3402ce6bbee1a32e8bb48e16144f3744d (patch)
tree077f40ea243e42a7c500e86392b06459a80f4435
parentd10e74e4a937c4ba1e59cf2bad549282688ff48e (diff)
downloadtcl-b64a70d3402ce6bbee1a32e8bb48e16144f3744d.zip
tcl-b64a70d3402ce6bbee1a32e8bb48e16144f3744d.tar.gz
tcl-b64a70d3402ce6bbee1a32e8bb48e16144f3744d.tar.bz2
[3381085] Improved way of detecting what version of the documentation to build.
Set the HTML_VERSION environment variable to override the (sensible) default.
-rw-r--r--unix/Makefile.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 505f7e0..74dd150 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -2076,6 +2076,9 @@ alldist: dist
# build of this HTML documentation that has already been placed online. As
# such, this rule is not guaranteed to work well on all systems; it only needs
# to function on those of the Tcl/Tk maintainers.
+#
+# Also note that the 8.6 tool build requires an installed 8.6 native Tcl
+# interpreter in order to be able to run.
#--------------------------------------------------------------------------
html: ${NATIVE_TCLSH}
@@ -2088,9 +2091,12 @@ html-tk: ${NATIVE_TCLSH}
$(BUILD_HTML) --tk
@EXTRA_BUILD_HTML@
+# You'd better have these programs or you will have problems creating Makefile
+# from Makefile.in in the first place...
+HTML_VERSION = `basename $(TOP_DIR) | sed s/tcl//`
BUILD_HTML = \
@${NATIVE_TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl \
- --htmldir="$(HTML_INSTALL_DIR)" \
+ --useversion=$(HTML_VERSION) --htmldir="$(HTML_INSTALL_DIR)" \
--srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS)
#--------------------------------------------------------------------------