Slight change to the apidoc build

Currently the temporary directory used for modules is under the current
directory; this patch changes it so a temp directory is used; so we
could build the apidocs with a R/O filesystem.

Reviewed-by: ultrotter

diff --git a/Makefile.am b/Makefile.am
index 0474980..e5a3047 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -330,12 +330,13 @@ stamp-directories: Makefile
 .PHONY: apidoc
 apidoc:
        test -e doc/api || mkdir doc/api
-       TMPDIR=`mktemp -d ./temp-epydoc.XXXXXX` && { \
+       TMPDIR=`mktemp -d ` && { \
                cp -r scripts daemons lib $$TMPDIR && \
                ( \
+                       CDIR=`pwd` && \
                        cd $$TMPDIR && \
                        mv lib ganeti && \
-                       epydoc --conf ../epydoc.conf \
+                       epydoc --conf $$CDIR/epydoc.conf -o $$CDIR/doc/api \
                ) ; \
                rm -rf $$TMPDIR ; \
        }

diff --git a/epydoc.conf b/epydoc.conf
index 2acda25..98900b8 100644 (file)
--- a/epydoc.conf
+++ b/epydoc.conf
@@ -4,7 +4,6 @@ name: Ganeti
 url: http://code.google.com/p/ganeti/
 
 output: html
-target: ../doc/api
 
 # note: the wildcards means the directories should be cleaned up after each
 # run, otherwise there will be stale '*c' (compiled) files that will not be