Update makefile for docs:

- newer phpdocumentor
- doc-generating tools are moved to a different directory

diff --git a/doc/Makefile b/doc/Makefile
index de708e0..5a77386 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -60,7 +60,8 @@ javadoc-out/index.html: ../lib/xmlrpc.inc ../lib/xmlrpcs.inc ../lib/xmlrpc_wrapp
 #      doxygen phpxmlrpc.dox\r
 #\r
 #      generate docs out of javadoc via phpdocumentor\r
-       ${PHPDOC} -f ../lib/xmlrpc.inc,../lib/xmlrpcs.inc,../lib/xmlrpc_wrappers.inc -t javadoc-out -ti PHP-XMLRPC -o HTML:frames:default -s\r
+       ${PHP} ${PHPDOC} -f ../lib/xmlrpc.inc,../lib/xmlrpcs.inc,../lib/xmlrpc_wrappers.inc -t javadoc-out --title PHP-XMLRPC\r
+       -rm -rf javadoc-out/phpdoc-cache-*\r
 \r
 dist: doc\r
        ${MKDIR} -p ../xmlrpc-${VERSION}/doc\r

diff --git a/doc/custom.fo.xsl b/doc/custom.fo.xsl
index 87abe8b..f87d974 100644 (file)
--- a/doc/custom.fo.xsl
+++ b/doc/custom.fo.xsl
@@ -7,11 +7,12 @@
  @author Gaetano Giunta\r
  @copyright (c) 2007-2014 G. Giunta\r
  @license\r
+ @todo make the xsl more dynamic: the path to import docbook.xsl could be f.e. rewritten/injected by the php user\r
 -->\r
 \r
 \r
 <!-- import base stylesheet -->\r
-<xsl:import href="../../../docbook-xsl/fo/docbook.xsl"/>\r
+<xsl:import href="../../../tools/docbook-xsl/fo/docbook.xsl"/>\r
 \r
 \r
 <!-- customization vars -->\r

diff --git a/doc/custom.xsl b/doc/custom.xsl
index 4a803a4..d38d2c7 100644 (file)
--- a/doc/custom.xsl
+++ b/doc/custom.xsl
@@ -6,11 +6,12 @@
  @author Gaetano Giunta\r
  @copyright (c) 2007-2014 G. Giunta\r
  @license\r
+ @todo make the xsl more dynamic: the path to import chunk.xsl could be f.e. rewritten/injected by the php user\r
 -->\r
 \r
 \r
 <!-- import base stylesheet -->\r
-<xsl:import href="../../../docbook-xsl/xhtml/chunk.xsl"/>\r
+<xsl:import href="../../../tools/docbook-xsl/xhtml/chunk.xsl"/>\r
 \r
 \r
 <!-- customization vars -->\r