[Python-modules-commits] [betamax] 07/09: Build the Sphinx documentation under the override_dh_sphinxdoc

[Daniele Tricoli]

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

eriol-guest pushed a commit to branch master
in repository betamax.

commit 22292d4663cc2431505082d102d9f65577264d57
Author: Daniele Tricoli <eriol at mornie.org>
Date:   Wed Jul 13 18:33:48 2016 +0200

    Build the Sphinx documentation under the override_dh_sphinxdoc
---
 debian/python-betamax-doc.docs | 1 -
 debian/rules                   | 9 ++++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/python-betamax-doc.docs b/debian/python-betamax-doc.docs
deleted file mode 100644
index a213c54..0000000
--- a/debian/python-betamax-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-docs/build/html
diff --git a/debian/rules b/debian/rules
index e35ba1e..64bb6a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,9 +21,12 @@ SPHINXOPTS := -D html_last_updated_fmt="$(BUILD_DATE)"
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-override_dh_auto_build:
-	dh_auto_build
-	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build $(SPHINXOPTS) -N -bhtml docs docs/build/html
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+	PYTHONPATH=. sphinx-build $(SPHINXOPTS) -N -bhtml docs/ \
+		debian/python-betamax-doc/usr/share/doc/python-betamax-doc/html/
+	dh_sphinxdoc
+endif
 
 # Tests must be copied manually since Jessie dh-python doesn't copy them.
 # Depending on dh-python >= 2.20151103 is an alternative, but it's not in

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/betamax.git