[X2Go-Commits] [python-x2go] 02/07: Makefile.docupload: Wrap around Sphinx's Makefile in docs/ subfolder.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit 58c6884f403d7c7730e69c46f92e578c38c082c9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 5 22:08:03 2018 +0100

    Makefile.docupload: Wrap around Sphinx's Makefile in docs/ subfolder.
---
 Makefile.docupload | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/Makefile.docupload b/Makefile.docupload
index c8990e0..daa1273 100644
--- a/Makefile.docupload
+++ b/Makefile.docupload
@@ -10,18 +10,10 @@ DOC_USER=x2go-admin
 doc: docbuild docupload
 
 docbuild:
-	mkdir -p .epydoc/html
-	mkdir -p .epydoc/pdf
-	mkdir -p .epydoc/pdf.tmp
-	rm -Rf .epydoc/html/*
-	epydoc --debug -n "Python X2Go" -u http://www.x2go.org -v --html --no-private -o .epydoc/html x2go/
-	#epydoc --debug --pdf --no-private -o .epydoc/pdf.tmp x2go/
-	#mv .epydoc/pdf.tmp/api.pdf .epydoc/pdf/Python-X2Go_API.pdf
-	#rm -Rf .epydoc/pdf.tmp
-
+	${MAKE} -C docs/ html SPHINXOPTS="-a -E"
 
 docupload:
 	ssh -l${DOC_USER} ${DOC_HOST} rm -Rfv ${DOC_PATH}/*
-	scp -r .epydoc/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATH}/
+	scp -r docs/build/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATH}/
 
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git