diff options
| author | donal.k.fellows@manchester.ac.uk <dkf> | 2013-10-06 19:17:20 (GMT) |
|---|---|---|
| committer | donal.k.fellows@manchester.ac.uk <dkf> | 2013-10-06 19:17:20 (GMT) |
| commit | 7a3e9722d57c09bb6083710b0c392f702fd1de61 (patch) | |
| tree | 077f40ea243e42a7c500e86392b06459a80f4435 | |
| parent | a4488e013c75dcfc171ea9eb68ab7c4fc3c848c2 (diff) | |
| download | tcl-7a3e9722d57c09bb6083710b0c392f702fd1de61.zip tcl-7a3e9722d57c09bb6083710b0c392f702fd1de61.tar.gz tcl-7a3e9722d57c09bb6083710b0c392f702fd1de61.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.in | 8 |
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) #-------------------------------------------------------------------------- |