summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2008-10-14 22:28:52 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2008-10-14 22:28:52 (GMT)
commitd2f63650246bf4b3ea03707677faa3d6243fe7be (patch)
tree543d1d380176af73fc653d54896fa37a9e698693 /win
parentf99e837b5153c13e6a5f3e964366819709358ce7 (diff)
downloadtcl-d2f63650246bf4b3ea03707677faa3d6243fe7be.zip
tcl-d2f63650246bf4b3ea03707677faa3d6243fe7be.tar.gz
tcl-d2f63650246bf4b3ea03707677faa3d6243fe7be.tar.bz2
Use the environment variable for program files to find the html help compiler
Diffstat (limited to 'win')
-rw-r--r--win/makefile.vc8
1 files changed, 4 insertions, 4 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 2811c90..2db853f 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.190 2008/10/02 19:01:30 mistachkin Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.191 2008/10/14 22:28:52 patthoyts Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -534,7 +534,7 @@ install: install-binaries install-libraries install-docs
test: setup $(TCLTEST) dlls $(CAT32)
set TCL_LIBRARY=$(ROOT)/library
!if "$(OS)" == "Windows_NT" || "$(MSVCDIR)" == "IDE"
- $(TCLTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) -loadfile <<
+ $(DEBUGGER) $(TCLTEST) "$(ROOT)/tests/all.tcl" $(TESTFLAGS) -loadfile <<
set ::ddelib [file normalize $(TCLDDELIB:\=/)]
set ::reglib [file normalize $(TCLREGLIB:\=/)]
<<
@@ -663,7 +663,7 @@ gentommath_h:
#---------------------------------------------------------------------
!ifndef HHC
-HHC="C:\Program Files\HTML Help Workshop\hhc.exe"
+HHC="%ProgramFiles%\HTML Help Workshop\hhc.exe"
!endif
HTMLDIR=$(ROOT)\html
HTMLBASE=TclTk$(VERSION)
@@ -672,7 +672,7 @@ CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
htmlhelp: chmsetup $(HHPFILE)
$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl
- $(HHC) $(HHPFILE) >NUL
+ "$(HHC)" $(HHPFILE) >NUL
chmsetup:
@if not exist $(HTMLDIR)\nul mkdir $(HTMLDIR)