From: gggeek <giunta.gaetano@gmail.com>
Date: Sun, 2 Feb 2014 19:54:35 +0000 (+0100)
Subject: Update makefile for docs:
X-Git-Tag: 3.0.0~6
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=ce636cdbf294ff68e3e0c6a539e8c6688936b6e5

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
--- 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
 #
 #	generate docs out of javadoc via phpdocumentor
-	${PHPDOC} -f ../lib/xmlrpc.inc,../lib/xmlrpcs.inc,../lib/xmlrpc_wrappers.inc -t javadoc-out -ti PHP-XMLRPC -o HTML:frames:default -s
+	${PHP} ${PHPDOC} -f ../lib/xmlrpc.inc,../lib/xmlrpcs.inc,../lib/xmlrpc_wrappers.inc -t javadoc-out --title PHP-XMLRPC
+	-rm -rf javadoc-out/phpdoc-cache-*
 
 dist: doc
 	${MKDIR} -p ../xmlrpc-${VERSION}/doc
diff --git a/doc/custom.fo.xsl b/doc/custom.fo.xsl
index 87abe8b..f87d974 100644
--- a/doc/custom.fo.xsl
+++ b/doc/custom.fo.xsl
@@ -7,11 +7,12 @@
  @author Gaetano Giunta
  @copyright (c) 2007-2014 G. Giunta
  @license
+ @todo make the xsl more dynamic: the path to import docbook.xsl could be f.e. rewritten/injected by the php user
 -->
 
 
 <!-- import base stylesheet -->
-<xsl:import href="../../../docbook-xsl/fo/docbook.xsl"/>
+<xsl:import href="../../../tools/docbook-xsl/fo/docbook.xsl"/>
 
 
 <!-- customization vars -->
diff --git a/doc/custom.xsl b/doc/custom.xsl
index 4a803a4..d38d2c7 100644
--- a/doc/custom.xsl
+++ b/doc/custom.xsl
@@ -6,11 +6,12 @@
  @author Gaetano Giunta
  @copyright (c) 2007-2014 G. Giunta
  @license
+ @todo make the xsl more dynamic: the path to import chunk.xsl could be f.e. rewritten/injected by the php user
 -->
 
 
 <!-- import base stylesheet -->
-<xsl:import href="../../../docbook-xsl/xhtml/chunk.xsl"/>
+<xsl:import href="../../../tools/docbook-xsl/xhtml/chunk.xsl"/>
 
 
 <!-- customization vars -->