diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2014-08-24 19:06:56 +0100 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2014-08-25 22:00:29 +0000 |
| commit | d3728738ddbb24daf248aa4d2f9ad94702a1ed0f (patch) | |
| tree | ad6ebff78337b75b610f5ecf8777afa0d4fad945 /config.nmake | |
| parent | 1aead575b08179689237c7e920113f4def90239b (diff) | |
Updates for docbook builds on Windows
In config.nmake search for multiple versions of fop in a couple of places, preferring fop 1.1
In Makefile.nmake remove any PYTHONPATH env var (as that's probably for Windows)
and not the Cygwin python used in asciidoc
In Readme.txt update some Cygwin package info
Change-Id: I117ec6bbdabc34829b421fd514508383b925090f
Reviewed-on: https://code.wireshark.org/review/3816
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/config.nmake b/config.nmake index f9968168e4..cca598874a 100644 --- a/config.nmake +++ b/config.nmake @@ -1285,9 +1285,19 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 12.0\VC\redist\$(TARGET_MACHI # You may want to install the FOP hyphenation patterns from # http://offo.sourceforge.net/hyphenation/ !IFNDEF FOP + +!IF EXIST(docbook\fop-1.1\fop.bat) +FOP=fop-1.1\fop.bat +!ELSE IF EXIST($(WIRESHARK_LIB_DIR)\fop-1.1\fop.bat) +FOP=$(WIRESHARK_LIB_DIR)\fop-1.1\fop.bat +!ELSE IF EXIST(docbook\fop-1.0\fop.bat) FOP=fop-1.0\fop.bat +!ELSE IF EXIST($(WIRESHARK_LIB_DIR)\fop-1.0\fop.bat) +FOP=$(WIRESHARK_LIB_DIR)\fop-1.0\fop.bat !ENDIF +!ENDIF FOP + # Additional options to fop. FOP_OPTS=-Xmx256m |