From ccbb9697eb0b0df24e42f22f2991ddb503ed0b08 Mon Sep 17 00:00:00 2001
From: Darko Poljak <foss@ungleich.com>
Date: Sat, 16 Jul 2016 00:50:01 +0200
Subject: [PATCH] Clean sphinx docs before building.

---
 Makefile                 | 4 ++++
 bin/build-helper         | 2 ++
 bin/build-helper.freebsd | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/Makefile b/Makefile
index 05c8004e..6d1e1de3 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,7 @@ PYTHON_VERSION=cdist/version.py
 
 SPHINXM=make -C $(DOCS_SRC_DIR) man
 SPHINXH=make -C $(DOCS_SRC_DIR) html
+SPHINXC=make -C $(DOCS_SRC_DIR) clean
 ################################################################################
 # Manpages
 #
@@ -71,6 +72,9 @@ html: $(MANTYPES) $(DOCSREF) $(PYTHON_VERSION)
 
 docs: man html
 
+docs-clean:
+	$(SPHINXC)
+
 # Manpages #5: release part
 MANWEBDIR=$(WEBBASE)/man/$(CHANGELOG_VERSION)
 HTMLBUILDDIR=docs/dist/html
diff --git a/bin/build-helper b/bin/build-helper
index 725c076f..55c75ef4 100755
--- a/bin/build-helper
+++ b/bin/build-helper
@@ -284,6 +284,8 @@ eof
         "$0" check-unittest
 
         # Generate documentation (man and html)
+        # First, clean old generated docs
+        make docs-clean
         make docs
 
         # Generate speeches (indirect check if they build)
diff --git a/bin/build-helper.freebsd b/bin/build-helper.freebsd
index dee12d0e..9051ab0d 100755
--- a/bin/build-helper.freebsd
+++ b/bin/build-helper.freebsd
@@ -319,6 +319,8 @@ eof
         "$0" check-unittest
 
         # Generate documentation (man and html)
+        # First, clean old generated docs
+        make helper=${helper} WEBDIR=${WEBDIR} docs-clean
         make helper=${helper} WEBDIR=${WEBDIR} docs
 
         # Generate speeches (indirect check if they build)