diff options
author | Kevin B Kenny <kennykb@acm.org> | 2014-06-29 02:20:31 (GMT) |
---|---|---|
committer | Kevin B Kenny <kennykb@acm.org> | 2014-06-29 02:20:31 (GMT) |
commit | 54aa5c1f2d5513d45d1361a3615125a4810cc1c0 (patch) | |
tree | 9e84f6c42d0fdc3d3a0958996705d2c2fbb5f722 /win/Makefile.in | |
parent | 2ac3c16d405d20153ce0ad43f308ff05bc372f7a (diff) | |
parent | c0edc29d67c0944180ce922c7f63d6dd3c3bdf6c (diff) | |
download | tcl-54aa5c1f2d5513d45d1361a3615125a4810cc1c0.zip tcl-54aa5c1f2d5513d45d1361a3615125a4810cc1c0.tar.gz tcl-54aa5c1f2d5513d45d1361a3615125a4810cc1c0.tar.bz2 |
merge trunk
Diffstat (limited to 'win/Makefile.in')
-rw-r--r-- | win/Makefile.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index eecab5e..0e22de0 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -651,8 +651,8 @@ install-libraries: libraries install-tzdata install-msgs done; @echo "Installing package msgcat 1.5.2 as a Tcl Module"; @$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/msgcat-1.5.2.tm; - @echo "Installing package tcltest 2.3.7 as a Tcl Module"; - @$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3.7.tm; + @echo "Installing package tcltest 2.3.8 as a Tcl Module"; + @$(COPY) $(ROOT_DIR)/library/tcltest/tcltest.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.5/tcltest-2.3.8.tm; @echo "Installing package platform 1.0.12 as a Tcl Module"; @$(COPY) $(ROOT_DIR)/library/platform/platform.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.4/platform-1.0.12.tm; @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; @@ -851,8 +851,10 @@ TOOL_DIR=$(ROOT_DIR)/tools HTML_INSTALL_DIR=$(ROOT_DIR)/html html: $(MAKE) shell SCRIPT="$(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) --srcdir=$(ROOT_DIR)/.. $(BUILD_HTML_FLAGS)" + html-tcl: $(TCLSH) $(MAKE) shell SCRIPT="$(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) --srcdir=$(ROOT_DIR)/.. $(BUILD_HTML_FLAGS) --tcl" + html-tk: $(TCLSH) $(MAKE) shell SCRIPT="$(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) --srcdir=$(ROOT_DIR)/.. $(BUILD_HTML_FLAGS) --tk" |