5 files changed, 12 insertions, 8 deletions

diff --git a/documentation/poky-ref-manual/Makefile b/documentation/poky-ref-manual/Makefile
index 0ee87a133c..5c5761c401 100644
--- a/documentation/poky-ref-manual/Makefile
+++ b/documentation/poky-ref-manual/Makefile
@@ -1,12 +1,12 @@
 all: html pdf tarball
 
 pdf:
-        cd ..; ./tools/poky-docbook-to-pdf ./poky-ref-manual/poky-handbook.xml ./template
-        cd ..; ./tools/poky-docbook-to-pdf ./poky-ref-manual/bsp-guide.xml ./template
+        ../tools/poky-docbook-to-pdf poky-handbook.xml ../template
+        ../tools/poky-docbook-to-pdf bsp-guide.xml ../template
 
 XSLTOPTS = --stringparam html.stylesheet style.css \
            --stringparam  chapter.autolabel 1 \
-           --stringparam  appendix.autolabel 1 \
+           --stringparam  appendix.autolabel A \
            --stringparam  section.autolabel 1 \
            --stringparam  section.label.includes.component.label 1 \
            --xinclude
diff --git a/documentation/poky-ref-manual/bsp-guide.xml b/documentation/poky-ref-manual/bsp-guide.xml
index 2f4906c173..a1752bf535 100644
--- a/documentation/poky-ref-manual/bsp-guide.xml
+++ b/documentation/poky-ref-manual/bsp-guide.xml
@@ -9,7 +9,7 @@
 
         <mediaobject>
             <imageobject>
-                <imagedata fileref='template/poky-handbook.png' 
+                <imagedata fileref='poky-handbook.png' 
                     format='SVG' 
                     align='center' scalefit='1' width='100%'/>
             </imageobject>    
diff --git a/documentation/poky-ref-manual/poky-handbook.xml b/documentation/poky-ref-manual/poky-handbook.xml
index fb2bc80df3..445217c786 100644
--- a/documentation/poky-ref-manual/poky-handbook.xml
+++ b/documentation/poky-ref-manual/poky-handbook.xml
@@ -9,7 +9,7 @@
 
         <mediaobject>
             <imageobject>
-                <imagedata fileref='template/poky-handbook.png' 
+                <imagedata fileref='poky-handbook.png' 
                     format='SVG' 
                     align='center' scalefit='1' width='100%'/>
             </imageobject>    
diff --git a/documentation/template/fop-config.xml b/documentation/template/fop-config.xml
index 7d56223d17..09cc5ca0f5 100644
--- a/documentation/template/fop-config.xml
+++ b/documentation/template/fop-config.xml
@@ -10,8 +10,8 @@
     Set the baseDir so common/openedhand.svg references in plans still
     work ok. Note, relative file references to current dir should still work.
     --> 
-  <base>template</base>
-  <font-base>template</font-base>
+  <base>../template</base>
+  <font-base>../template</font-base>
  
   <!-- Source resolution in dpi (dots/pixels per inch) for determining the
        size of pixels in SVG and bitmap images, default: 72dpi -->
diff --git a/documentation/tools/poky-docbook-to-pdf b/documentation/tools/poky-docbook-to-pdf
index aa221c02bc..9ac0b828cf 100755
--- a/documentation/tools/poky-docbook-to-pdf
+++ b/documentation/tools/poky-docbook-to-pdf
@@ -30,11 +30,15 @@ xsltproc --xinclude                    \
          --stringparam  body.font.master  9 \
          --stringparam  title.font.master  11 \
          --stringparam draft.watermark.image "$TEMPLATEDIR/draft.png" \
+         --stringparam  chapter.autolabel 1 \
+         --stringparam  appendix.autolabel A \
+         --stringparam  section.autolabel 1 \
+         --stringparam  section.label.includes.component.label 1 \
          --output $FO               \
          $TEMPLATEDIR/poky-db-pdf.xsl    \
          $1                 || exit 1
 
-echo fop -c $TEMPLATEDIR/fop-config.xml -fo $FO -pdf $PDF       || exit 1
+
 fop -c $TEMPLATEDIR/fop-config.xml -fo $FO -pdf $PDF       || exit 1
 
 rm -f $FO