diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2016-05-12 21:02:22 -0400 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-05-13 11:59:45 +0000 |
| commit | eb047b0ec71355d06318864d0c05befdb9cd7cb8 (patch) | |
| tree | 62569b573fceacd77440b4848e385024238e248a /docbook/Makefile.nmake | |
| parent | 2b52f2440c31811e8ffd05970f09b03cf19602b2 (diff) | |
Fix inclusion of images in PDF versions of the guides.
We need to point xsltproc to the images directories.
The bigger images have scaling problems but at least they're
there now.
This is already done in cmake.
Change-Id: I260a8f3e335b9f5726811bcd6811f6c5b9f3a6b2
Reviewed-on: https://code.wireshark.org/review/15408
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'docbook/Makefile.nmake')
| -rw-r--r-- | docbook/Makefile.nmake | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake index 5d07b0636c..23fa4c748d 100644 --- a/docbook/Makefile.nmake +++ b/docbook/Makefile.nmake @@ -11,6 +11,7 @@ TOOLS_DIR=..\tools include ..\config.nmake top_srcdir=.. +srcdir=. include Makefile.common WSUG_SOURCE = $(WSUG_SOURCE) Makefile.nmake @@ -101,7 +102,9 @@ wsug_html_chunked\index.html: $(WSUG_SOURCE) user-guide-us.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl !ifdef FOP @ echo --- WSUG - PDF US PAPER --- - $(XSLTPROC) --stringparam paper.type letter --nonet custom_layer_pdf.xsl user-guide.xml > $@ + $(XSLTPROC) --stringparam paper.type letter \ + $(COMMON_XSLTPROC_ARGS) $(WSUG_PDF_XSLTPROC_ARGS) \ + --nonet custom_layer_pdf.xsl user-guide.xml > $@ !endif # create pdf file (through XSL-FO), portrait pages on A4 paper @@ -109,7 +112,9 @@ user-guide-us.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl user-guide-a4.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl !ifdef FOP @ echo --- WSUG - PDF A4 PAPER --- - $(XSLTPROC) --stringparam paper.type A4 --nonet custom_layer_pdf.xsl user-guide.xml > $@ + $(XSLTPROC) --stringparam paper.type A4 \ + $(COMMON_XSLTPROC_ARGS) $(WSUG_PDF_XSLTPROC_ARGS) \ + --nonet custom_layer_pdf.xsl user-guide.xml > $@ !endif # create MS html help file (through html chunked pages) @@ -183,7 +188,9 @@ wsdg_html_chunked\index.html: $(WSDG_SOURCE) developer-guide-us.fo: $(WSDG_SOURCE) custom_layer_pdf.xsl !ifdef FOP @ echo --- WSDG - PDF US PAPER --- - $(XSLTPROC) --stringparam paper.type letter --nonet custom_layer_pdf.xsl developer-guide.xml > $@ + $(XSLTPROC) --stringparam paper.type letter \ + $(COMMON_XSLTPROC_ARGS) $(WSDG_PDF_XSLTPROC_ARGS) \ + --nonet custom_layer_pdf.xsl developer-guide.xml > $@ !endif # create pdf file (through XSL-FO), portrait pages on A4 paper @@ -191,7 +198,9 @@ developer-guide-us.fo: $(WSDG_SOURCE) custom_layer_pdf.xsl developer-guide-a4.fo: $(WSDG_SOURCE) custom_layer_pdf.xsl !ifdef FOP @ echo --- WSDG - PDF A4 PAPER --- - $(XSLTPROC) --stringparam paper.type A4 --nonet custom_layer_pdf.xsl developer-guide.xml > $@ + $(XSLTPROC) --stringparam paper.type A4 \ + $(COMMON_XSLTPROC_ARGS) $(WSDG_PDF_XSLTPROC_ARGS) \ + --nonet custom_layer_pdf.xsl developer-guide.xml > $@ !endif # create MS html help file (through html chunked pages) |