From 40a4fd1f8e0050f3848343240e8428bd238d28af Mon Sep 17 00:00:00 2001
From: davygrvy <davygrvy@pobox.com>
Date: Mon, 19 Jan 2009 22:10:57 +0000
Subject: Addressed the over-building nature of the htmlhelp target by moving
 from a pseudo target to a real target dependent on the entire docs/ directory
 contents.

---
 win/makefile.vc | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/win/makefile.vc b/win/makefile.vc
index f603351..8533c14 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.196 2009/01/19 19:54:19 davygrvy Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.197 2009/01/19 22:10:57 davygrvy Exp $
 #------------------------------------------------------------------------------
 
 # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -726,21 +726,17 @@ HTMLBASE=TclTk$(VERSION)
 HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp
 CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
 
-htmlhelp: chmsetup $(HHPFILE)
-	$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl
-	$(HHC) $(HHPFILE) >NUL
-
-chmsetup:
-	@if not exist $(HTMLDIR)\nul mkdir $(HTMLDIR)
+htmlhelp: chmsetup $(CHMFILE)
 
-$(HHPFILE):
-	type << > $@
+$(CHMFILE): $(DOCDIR)\*
+	$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl
+	$(HHC) <<$(HHPFILE)
 [OPTIONS]
 Compatibility=1.1 or later
 Compiled file=$(HTMLBASE).chm
 Display compile progress=no
 Error log file=$(HTMLBASE).log
-Language=0x809 English (United Kingdom)
+Language=0x409 English (United States)
 Title=Tcl/Tk $(DOT_VERSION) Help
 [FILES]
 contents.htm
@@ -753,6 +749,9 @@ TkLib
 UserCmd
 <<
 
+chmsetup:
+	@if not exist $(HTMLDIR)\nul mkdir $(HTMLDIR)
+
 #-------------------------------------------------------------------------
 # Build the old-style Windows .hlp file
 #-------------------------------------------------------------------------
-- 
cgit v0.12