diff options
| author | Gerald Combs <gerald@wireshark.org> | 2008-12-17 21:11:20 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2008-12-17 21:11:20 +0000 |
| commit | c9c32db1870e604415aefd8e34e6efa23f5cf4b8 (patch) | |
| tree | 8b3cdd94fcd2799f6c9766d548adde79826c07fd /config.nmake | |
| parent | f49377e0e7be6ef7d30ff1dfe685b079ef06249f (diff) | |
Remove lynx as a dependency on Windows. By default, create the FAQ using
html2text.py. You can override this by adjusting config.nmake or by setting
HTML2TXT.
svn path=/trunk/; revision=27041
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake index 648d0e8246..b4684c2471 100644 --- a/config.nmake +++ b/config.nmake @@ -44,6 +44,13 @@ WIRESHARK_LIBS=C:\wireshark-$(PLATFORM)-libs PROGRAM_FILES=$(PROGRAMFILES) # +# Location of the "tools" directory. This affects HTML2TXT below and should +# be overridden by makefiles in any subdirectories that use HTML2TXT. +!IFNDEF TOOLS_DIR +TOOLS_DIR=tools +!ENDIF + +# # Machine type for the compiler and linker # TARGET_MACHINE (Used for link /MACHINE) should be one of "X86" or "X64" # (sorry ARM, Alpha, MIPS, and Itanium fans). @@ -579,8 +586,11 @@ HHC_EXE="$(HHC_DIR)\hhc.exe" # (cygwin: lynx works, elinks not available, links and true doesn't produce output) #HTML2TXT=elinks -dump -dump-width 72 #HTML2TXT=links -dump -width 72 -HTML2TXT=lynx -dump -width=72 -nolist -stdin -#HTML2TXT="true" +#HTML2TXT=lynx -dump -width=72 -nolist -stdin + +!IFNDEF HTML2TXT +HTML2TXT=$(PYTHON) $(TOOLS_DIR)\html2text.py --width=72 --no-links +!ENDIF # the XSL processor (part of cygwin's libxslt package) XSLTPROC="xsltproc" |