summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-03-24 13:09:29 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-03-24 13:09:29 (GMT)
commit83d6fd77b0a343aed0a2e23b161df3a26d70136f (patch)
treeba25fea4844a56818767fe66e21ed2a62efcbe24 /unix
parent4431f3dbff4596aed80a6e91baf0819e5f69f189 (diff)
parent0f1fe8880dc481b214a344189a6a6904b59eede0 (diff)
downloadtcl-83d6fd77b0a343aed0a2e23b161df3a26d70136f.zip
tcl-83d6fd77b0a343aed0a2e23b161df3a26d70136f.tar.gz
tcl-83d6fd77b0a343aed0a2e23b161df3a26d70136f.tar.bz2
Merge 8.7
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile.in7
1 files changed, 2 insertions, 5 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index d331955..21c41de 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -2302,13 +2302,10 @@ 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 \
- --useversion=$(HTML_VERSION) --htmldir="$(HTML_INSTALL_DIR)" \
- --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS)
+ --tcl --useversion=$(MAJOR_VERSION).$(MINOR_VERSION) --htmldir="$(HTML_INSTALL_DIR)" \
+ --srcdir=$(TOP_DIR) $(BUILD_HTML_FLAGS)
#--------------------------------------------------------------------------
# The list of all the targets that do not correspond to real files. This stops