diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-26 15:03:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-26 15:03:11 (GMT) |
| commit | 2a21b737eaf5db0eb26712dae12203c3c75fbd42 (patch) | |
| tree | 8d0ada6315e27bb17dde1bd76c2c4c8740da5133 /win/makefile.vc | |
| parent | a8f018d5b84b9b8f4c01f528fe41998ddd389fbe (diff) | |
| parent | 098fae735aadcba5814ce789a31e46582366dee8 (diff) | |
| download | tcl-2a21b737eaf5db0eb26712dae12203c3c75fbd42.zip tcl-2a21b737eaf5db0eb26712dae12203c3c75fbd42.tar.gz tcl-2a21b737eaf5db0eb26712dae12203c3c75fbd42.tar.bz2 | |
merge core-8-6-branch
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index ec7afac..8cd63c2 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -738,7 +738,7 @@ gentommath_h: !ifndef HHC
HHC=""%ProgramFiles%\HTML Help Workshop\hhc.exe""
!endif
-HTMLDIR=$(ROOT)\html
+HTMLDIR=$(OUT_DIR)\html
HTMLBASE=TclTk$(VERSION)
HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp
CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
@@ -746,25 +746,27 @@ CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm htmlhelp: chmsetup $(CHMFILE)
$(CHMFILE): $(DOCDIR)\*
- @$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl
+ @$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"
@echo Compiling HTML help project
- @$(HHC) <<$(HHPFILE) >NUL
+ -$(HHC) <<$(HHPFILE) >NUL
[OPTIONS]
Compatibility=1.1 or later
Compiled file=$(HTMLBASE).chm
+Default topic=contents.htm
Display compile progress=no
Error log file=$(HTMLBASE).log
+Full-text search=Yes
Language=0x409 English (United States)
Title=Tcl/Tk $(DOT_VERSION) Help
[FILES]
contents.htm
docs.css
-Keywords
-TclCmd
-TclLib
-TkCmd
-TkLib
-UserCmd
+Keywords\*.htm
+TclCmd\*.htm
+TclLib\*.htm
+TkCmd\*.htm
+TkLib\*.htm
+UserCmd\*.htm
<<
chmsetup:
|