diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-07-24 19:28:48 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-07-25 02:30:02 +0000 |
| commit | 05c06306b10318e895aa3996364da75b39fe394c (patch) | |
| tree | ce480d88363cc3d7793159424c7e0bf995a0a0a0 | |
| parent | 5688c8a4ce5448e8b6b1e16cb8dcd77cfe04a8d1 (diff) | |
Make HTML Help steps compliant with newer Nmakes.
Nmake 12 seems to be more strict about spaces in commands. Add the
hhc.exe path to PATH and use a bare command instead.
Change-Id: I9fbd9abdabf7f51ac7bac2cbe8d938ae7bb0640e
Reviewed-on: https://code.wireshark.org/review/3192
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | config.nmake | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/config.nmake b/config.nmake index 38e44b9f72..c7881b8ad5 100644 --- a/config.nmake +++ b/config.nmake @@ -1268,14 +1268,6 @@ FOP=fop-1.0\fop.bat # Additional options to fop. FOP_OPTS=-Xmx256m -# html help compiler -# Comment this out if you don't have hhc.exe or you don't want the docs in -# .chm format. -# -# Beware: hhc.exe is NOT part of the MSVC packages in HHC_DIR mentioned above, -# so you'll need to install the HTML Help Workshop for this. -HHC_EXE="$(HHC_DIR)\hhc.exe" - # html to text converter for text version of release notes, e.g. elinks. # This could also be "lynx", or "true" if neither elinks nor lynx is installed # (cygwin: lynx works, elinks not available, links and true doesn't produce output) @@ -1641,6 +1633,8 @@ PORTAUDIO_CONFIG= !ENDIF !IFDEF HHC_DIR +PATH=$(PATH);$(HHC_DIR) +HHC_EXE=hhc.exe HHC_CFLAGS=-DHHC_DIR HHC_LIBS=htmlhelp.lib !ELSE |