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>

diff --git a/docbook/Makefile.am b/docbook/Makefile.am
index 583bb3a22e3c0689c17485292bc4f1f81152f0c4..ecee49acf745c6ff64a18891d217efd53a9f0db9 100644 (file)
--- a/docbook/Makefile.am
+++ b/docbook/Makefile.am
@@ -74,6 +74,7 @@ wsug_html_chunked/index.html: $(WSUG_SOURCE)
 user-guide-us.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl
        @ echo --- WSUG - PDF US PAPER ---
        $(XSLTPROC) --stringparam paper.type letter \
+               $(COMMON_XSLTPROC_ARGS) $(WSUG_PDF_XSLTPROC_ARGS) \
                --nonet $(srcdir)/custom_layer_pdf.xsl $< > $@
 
 # create pdf file (through XSL-FO), portrait pages on A4 paper
@@ -81,6 +82,7 @@ user-guide-us.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl
 user-guide-a4.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl
        @ echo --- WSUG - PDF A4 PAPER ---
        $(XSLTPROC) --stringparam paper.type A4 \
+               $(COMMON_XSLTPROC_ARGS) $(WSUG_PDF_XSLTPROC_ARGS) \
                --nonet $(srcdir)/custom_layer_pdf.xsl $< > $@
 
 wsluarm: make-wsluarm.pl $(WSLUA_MODULES)
@@ -139,6 +141,7 @@ wsdg_html_chunked/index.html: $(WSDG_SOURCE)
 developer-guide-us.fo: $(WSDG_SOURCE) custom_layer_pdf.xsl
        @ echo --- WSDG - PDF US PAPER ---
        $(XSLTPROC) --stringparam paper.type letter \
+                   $(COMMON_XSLTPROC_ARGS) $(WSDG_PDF_XSLTPROC_ARGS) \
                    --path .:wsluarm_src:$(srcdir) \
                    --nonet $(srcdir)/custom_layer_pdf.xsl $< > $@
 
@@ -147,6 +150,7 @@ developer-guide-us.fo: $(WSDG_SOURCE) custom_layer_pdf.xsl
 developer-guide-a4.fo: $(WSDG_SOURCE) custom_layer_pdf.xsl
        @ echo --- WSDG - PDF A4 PAPER ---
        $(XSLTPROC) --stringparam paper.type A4 \
+                   $(COMMON_XSLTPROC_ARGS) $(WSDG_PDF_XSLTPROC_ARGS) \
                    --path .:wsluarm_src:$(srcdir) \
                    --nonet $(srcdir)/custom_layer_pdf.xsl $< > $@
 

diff --git a/docbook/Makefile.common b/docbook/Makefile.common
index 8401657692a62192a297f764d5082f931ce6296c..18d065b1fe48fa14ffce2fc2927017bb264b809d 100644 (file)
--- a/docbook/Makefile.common
+++ b/docbook/Makefile.common
@@ -301,9 +301,17 @@ COMMON_XSLTPROC_ARGS = \
 WSUG_XSLTPROC_ARGS = \
        --stringparam admon.graphics.path wsug_graphics/
 
+WSUG_PDF_XSLTPROC_ARGS = \
+               --stringparam img.src.path $(srcdir)/ \
+               --stringparam admon.graphics.path $(srcdir)/common_graphics/
+
 WSDG_XSLTPROC_ARGS = \
        --stringparam admon.graphics.path wsdg_graphics/
 
+WSDG_PDF_XSLTPROC_ARGS = \
+               --stringparam img.src.path $(srcdir)/ \
+               --stringparam admon.graphics.path $(srcdir)/common_graphics/
+
 SINGLE_XSLTPROC_ARGS = \
        --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl
 

diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake
index 5d07b0636cc13fdf0776d6c622d3f9ac6b708097..23fa4c748d562a69b0d2f0286d71da7f8c94283b 100644 (file)
--- 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)