Fixes for doc generation with new dir structure

diff --git a/doc/build/custom.fo.xsl b/doc/build/custom.fo.xsl
index b1964c0..0d73049 100644 (file)
--- a/doc/build/custom.fo.xsl
+++ b/doc/build/custom.fo.xsl
@@ -12,7 +12,7 @@
 
 
 <!-- import base stylesheet -->
-<xsl:import href="../../../../vendor/docbook/docbook-xsl/fo/docbook.xsl"/>
+<xsl:import href="../../../../../../vendor/docbook/docbook-xsl/fo/docbook.xsl"/>
 
 
 <!-- customization vars -->

diff --git a/doc/build/custom.xsl b/doc/build/custom.xsl
index aed8d5e..c96cf55 100644 (file)
--- a/doc/build/custom.xsl
+++ b/doc/build/custom.xsl
@@ -15,7 +15,7 @@
 
 
 <!-- import base stylesheet -->
-<xsl:import href="../../vendor/docbook/docbook-xsl/xhtml/chunk.xsl"/>
+<xsl:import href="../../../../vendor/docbook/docbook-xsl/xhtml/chunk.xsl"/>
 
 
 <!-- customization vars -->

diff --git a/pakefile.php b/pakefile.php
index 09f060f..35a3301 100644 (file)
--- a/pakefile.php
+++ b/pakefile.php
@@ -283,7 +283,7 @@ function run_doc($task=null, $args=array(), $cliOpts=array())
     // convert to fo and then to pdf using apache fop
     Builder::applyXslt($docDir.'/manual/phpxmlrpc_manual.xml', $docDir.'/build/custom.fo.xsl', $docDir.'/manual/phpxmlrpc_manual.fo.xml');
     $cmd = Builder::tool('fop');
-    pake_sh("$cmd $docDir/phpxmlrpc_manual.fo.xml $docDir/phpxmlrpc_manual.pdf");
+    pake_sh("$cmd $docDir/manual/phpxmlrpc_manual.fo.xml $docDir/manual/phpxmlrpc_manual.pdf");
     unlink($docDir.'/manual/phpxmlrpc_manual.fo.xml');
 }