CDRIVER-1979 fix "make distcheck"

Author: ajdavis

doc/.gitignore

@@ -11,3 +11,4 @@ html/_static
 html/.buildinfo
 html/.nojekyll
 man/*.3
+man/.buildinfo

doc/Makefile.am

@@ -1 +1,20 @@
+EXTRA_DIST += $(wildcard doc/*.rst)
+
+# TODO: remove libbson-objects.inv once libbson's Sphinx docs are on mongoc.org
+EXTRA_DIST += \
+  doc/conf.py \
+  doc/githubpages.py \
+  doc/libbson-objects.inv \
+  doc/mongoc/__init__.py \
+  doc/mongoc-theme/globaltoc.html \
+  doc/mongoc-theme/layout.html \
+  doc/mongoc-theme/static/mongoc.css_t \
+  doc/mongoc-theme/static/pygments.css \
+  doc/mongoc-theme/theme.conf \
+  doc/taglist/__init__.py
+
 dist-hook: man html
+
+clean-local:
+	-rm -rf doc/man/.buildinfo doc/man/.doctrees
+	-rm -rf doc/html/.buildinfo doc/html/.doctrees doc/html/_static

doc/conf.py

@@ -13,7 +13,9 @@
 ]
 
 intersphinx_mapping = {
-    # TODO: update to mongoc.org once libbson 1.6.0 is released.
+    # TODO: update to mongoc.org once libbson 1.6.0 is released, replace
+    # 'libbson-objects.inv' here with None and delete the file. Remove from
+    # doc/Makefile.am too.
     'bson': ('https://s3.amazonaws.com/mciuploads/libbson/docs/latest/',
              'libbson-objects.inv'),
 }

doc/html/Makefile.am

@@ -2,13 +2,14 @@ CLEANFILES += $(wildcard doc/html/*.html)
 CLEANFILES += $(wildcard doc/html/*.css)
 CLEANFILES += $(wildcard doc/html/*.js)
 CLEANFILES += $(wildcard doc/html/*.png)
+CLEANFILES += doc/html/.nojekyll doc/html/objects.inv doc/html/searchindex.js
 
 .PHONY: doc/html
 
-# "E" is "ignore cache", and "d" sets the dir to save cachefiles in.
+# "E" is "ignore cache".
 doc/html:
 	-mkdir -p doc/html
-	$(SPHINX_BUILD) -qEW -d /tmp/sphinx-cache-dir doc doc/html
+	$(SPHINX_BUILD) -qEW $(top_srcdir)/doc doc/html
 
 SPHINX_HTML_FILES = \
    doc/html/.nojekyll \

doc/man/Makefile.am

@@ -1,4 +1,3 @@
-MAN_FILES_TO_BUILD = $(patsubst doc/%.page,doc/man/%.3,$(wildcard doc/*.page))
 BUILT_MAN_FILES = $(wildcard doc/man/*.3)
 CLEANFILES += $(wildcard doc/man/*.3)
 
@@ -11,12 +10,12 @@ dist_noinst_DATA = $(dist_man_MANS)
 
 man3_MANS = $(BUILT_MAN_FILES)
 
-.PHONY: doc/man
+.PHONY: man
 
-doc/man:
+# "E" is "ignore cache", "b" is build type.
+man:
 	-mkdir -p doc/man
-   # "E" is "ignore cache", "d" sets dir for cachefiles, "b" is build type.
-	$(SPHINX_BUILD) -qEW -d /tmp/sphinx-cache-dir -b man doc doc/man
+	$(SPHINX_BUILD) -qEW -b man $(top_srcdir)/doc doc/man
 
 man: $(MAN_FILES_TO_BUILD)
 EXTRA_DIST += $(MAN_FILES_TO_BUILD)