Merge pull request #136 from slack/consolidate-docs-1

Cleanups and adapters for documentation consolidation.

Author: slack

Makefile

@@ -2,7 +2,7 @@
 #
 
 # You can set these variables from the command line.
-BUILDDIR        = _build
+BUILDDIR        ?= _build/html
 MKDOCS          = mkdocs
 MKDOCSBUILDOPTS = --clean --strict --verbose
 MKDOCSBUILD     = $(MKDOCS) build $(MKDOCSBUILDOPTS)
@@ -18,9 +18,9 @@ DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_
 DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
 
 build:
-	$(MKDOCSBUILD) --site-dir $(BUILDDIR)/html
+	$(MKDOCSBUILD) --site-dir $(BUILDDIR)
 	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)."
 
 serve:
 	$(MKDOCSSERVE)
@@ -34,7 +34,7 @@ deps:
 test: build
 	grep -q '<title>Deis Documentation</title>' _build/html/index.html
 	@echo
-	@echo "Test finished. The HTML pages are in $(BUILDDIR)/html."
+	@echo "Test finished. The HTML pages are in $(BUILDDIR)."
 
 docker-build:
 	docker build --rm -t ${IMAGE} .

_scripts/gutenbuild

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+set -x
+
+build_dest=$1
+
+PATH=$HOME/.local/bin:$PATH BUILDDIR=${build_dest} make deps build