summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorJoe Mistachkin <joe@mistachkin.com>2008-10-02 19:01:30 (GMT)
committerJoe Mistachkin <joe@mistachkin.com>2008-10-02 19:01:30 (GMT)
commit430612c9b1d9221b032c2c2dabbfed4a10570b50 (patch)
tree7c5087b839c039d878ec1e8c5a0022ae0953534a /win
parentff1f43598ccc3d0a157e9bd32a7f48ecacf42331 (diff)
downloadtcl-430612c9b1d9221b032c2c2dabbfed4a10570b50.zip
tcl-430612c9b1d9221b032c2c2dabbfed4a10570b50.tar.gz
tcl-430612c9b1d9221b032c2c2dabbfed4a10570b50.tar.bz2
Fixes for [Bug 1934272, 2072891]
Diffstat (limited to 'win')
-rwxr-xr-xwin/buildall.vc.bat4
-rw-r--r--win/makefile.vc5
2 files changed, 4 insertions, 5 deletions
diff --git a/win/buildall.vc.bat b/win/buildall.vc.bat
index 1201bb2..aff1bc6 100755
--- a/win/buildall.vc.bat
+++ b/win/buildall.vc.bat
@@ -3,7 +3,7 @@
:: edit this (or make your own) for your needs and wants using
:: the instructions for calling makefile.vc found in makefile.vc
::
-:: RCS: @(#) $Id: buildall.vc.bat,v 1.9 2005/10/14 12:31:39 patthoyts Exp $
+:: RCS: @(#) $Id: buildall.vc.bat,v 1.10 2008/10/02 19:01:30 mistachkin Exp $
set SYMBOLS=
@@ -54,7 +54,7 @@ if "%INSTALLDIR%" == "" set INSTALLDIR=C:\Program Files\Tcl
::
set OPTS=none
if not %SYMBOLS%.==. set OPTS=symbols
-nmake -nologo -f makefile.vc release winhelp OPTS=%OPTS% %1
+nmake -nologo -f makefile.vc release htmlhelp OPTS=%OPTS% %1
if errorlevel 1 goto error
:: Build the static core, dlls and shell.
diff --git a/win/makefile.vc b/win/makefile.vc
index fc9014e..2811c90 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -13,7 +13,7 @@
# Copyright (c) 2003-2008 Pat Thoyts.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.189 2008/08/29 12:37:18 dkf Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.190 2008/10/02 19:01:30 mistachkin Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -761,13 +761,12 @@ install-docs:
!if exist($(CHMFILE))
@echo Installing compiled html help
@$(CPY) "$(CHMFILE)" "$(DOC_INSTALL_DIR)\"
-!else
+!endif
!if exist($(HELPFILE))
@echo Installing Windows help
@$(CPY) "$(HELPFILE)" "$(DOC_INSTALL_DIR)\"
@$(CPY) "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"
!endif
-!endif
#"
#---------------------------------------------------------------------