From f4e4349cadfc93b252489357206f87c5ebfea419 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Sun, 8 Oct 2017 14:25:19 +0000
Subject: Fix htmlhelp generation on 64-bit systems

---
 win/makefile.vc | 11 +++++------
 win/rules.vc    | 12 ------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/win/makefile.vc b/win/makefile.vc
index dfbf961..62e3fa7 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -613,13 +613,12 @@ gentommath_h:
 # Build the Windows HTML help file.
 #---------------------------------------------------------------------
 
-# NOTE: you can define HHC on the command-line to override this
-!ifndef HHC
-!if exist("$(PROGRAMFILES_X86)\HTML Help Workshop\hhc.exe")
-HHC=$(PROGRAMFILES_X86)\HTML Help Workshop\hhc.exe
+# NOTE: you can define HHC on the command-line to override this.
+# nmake does not set macro values if already set on the command line.
+!if defined(PROCESSOR_ARCHITECTURE) && "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+HHC="%ProgramFiles(x86)%\HTML Help Workshop\hhc.exe"
 !else
-HHC=hhc.exe
-!endif
+HHC="%ProgramFiles%\HTML Help Workshop\hhc.exe"
 !endif
 HTMLDIR=$(OUT_DIR)\html
 HTMLBASE=TclTk$(VERSION)
diff --git a/win/rules.vc b/win/rules.vc
index d5952fd..6ab58f6 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -98,18 +98,6 @@ CPY	= xcopy /i /y >NUL
 COPY	= copy /y >NUL
 MKDIR   = mkdir
 
-# The ProgramFiles(x86) environment variable is not accessible
-# from nmake since it has the parenthesis which nmake does not like
-# within a macro name. So define our own in terms of the
-# ProgramFiles environment variable.
-# Note: env variables are always UPPER CASE in nmake
-!if defined(PROCESSOR_ARCHITECTURE) && "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
-PROGRAMFILES_X86 = $(PROGRAMFILES) (x86)
-!else
-PROGRAMFILES_X86 = $(PROGRAMFILES)
-!endif
-
-
 ######################################################################
 # 2. Figure out our build environment in terms of what we're building.
 #
-- 
cgit v0.12