Merge pull request #134 from stgraber/doc

Makefile: Build doc in production mode

Makefile

@@ -143,7 +143,7 @@ doc: doc-setup doc-incremental
 .PHONY: doc-incremental
 doc-incremental:
 	@echo "Build the documentation"
-	. $(SPHINXENV) ; LOCAL_SPHINX_BUILD=True sphinx-build -c doc/ -b dirhtml doc/ doc/html/ -d doc/.sphinx/.doctrees -w doc/.sphinx/warnings.txt
+	. $(SPHINXENV) ; sphinx-build -c doc/ -b dirhtml doc/ doc/html/ -d doc/.sphinx/.doctrees -w doc/.sphinx/warnings.txt
 
 .PHONY: doc-serve
 doc-serve:

doc/conf.py

@@ -22,18 +22,14 @@
     os.symlink('../../deps/swagger-ui/dist/swagger-ui.css', '.sphinx/_static/swagger-ui/swagger-ui.css')
 
 ### MAN PAGES ###
-# Find path to incus client (different for local builds and on RTD)
-if ("LOCAL_SPHINX_BUILD" in os.environ and
-    os.environ["LOCAL_SPHINX_BUILD"] == "True"):
-    path = str(subprocess.check_output(['go', 'env', 'GOPATH'], encoding="utf-8").strip())
-    incus = os.path.join(path, 'bin', 'incus')
-    if os.path.isfile(incus):
-        print("Using " + incus + " to generate man pages.")
-    else:
-        print("Cannot find incus in " + incus)
-        exit(2)
+# Find the path to the incus binary
+path = str(subprocess.check_output(['go', 'env', 'GOPATH'], encoding="utf-8").strip())
+incus = os.path.join(path, 'bin', 'incus')
+if os.path.isfile(incus):
+    print("Using " + incus + " to generate man pages.")
 else:
-    incus = "../incus.bin"
+    print("Cannot find incus in " + incus)
+    exit(2)
 
 # Generate man pages content
 os.makedirs('.sphinx/deps/manpages', exist_ok=True)