diff options
| author | apnadkarni <apnmbx-wits@yahoo.com> | 2017-10-08 14:25:19 (GMT) |
|---|---|---|
| committer | apnadkarni <apnmbx-wits@yahoo.com> | 2017-10-08 14:25:19 (GMT) |
| commit | f4e4349cadfc93b252489357206f87c5ebfea419 (patch) | |
| tree | a7ea7e751a7feef7a0efffa36d84b54f4b99944d /win/makefile.vc | |
| parent | 9845cc7c9ceedb5f71e3f0223391fb952156b7d1 (diff) | |
| download | tcl-f4e4349cadfc93b252489357206f87c5ebfea419.zip tcl-f4e4349cadfc93b252489357206f87c5ebfea419.tar.gz tcl-f4e4349cadfc93b252489357206f87c5ebfea419.tar.bz2 | |
Fix htmlhelp generation on 64-bit systems
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 11 |
1 files changed, 5 insertions, 6 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)
|