From 5eba2a45b7c2a3db2b331161e858a3e8ac8701a2 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Wed, 4 Oct 2017 18:43:21 +0200
Subject: [PATCH] Make release and documentation more sane.

OK, I think I have this nailed now.
---
 .gitignore |  1 +
 Makefile   |  9 ++++-----
 README.md  | 17 +----------------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 31a99a9..628088c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+proddist/
 dist/
 .sass-cache/
 .jekyll-metadata
diff --git a/Makefile b/Makefile
index cbbc23c..deefc22 100644
--- a/Makefile
+++ b/Makefile
@@ -2,18 +2,17 @@ DEV_DIST_DIR:=dist
 PROD_DIST_DIR:=proddist
 PROD_REMOTE:=git@gitlab.com:autonomic-cooperative/autonomic-cooperative.gitlab.io.git
 PROD_BRANCH:=production
+PROD_BASE_URL:=https://autonomic.zone
 
 devserver:
 	@echo "Serving development site from $(DEV_DIST_DIR)"
 	@jekyll serve --watch --incremental --destination $(DEV_DIST_DIR)
 .PHONY: devserver
 
-proddist:
-	@echo "Building production site into $(PROD_DIST_DIR)"
-	@jekyll build --destination $(PROD_DIST_DIR)
-.PHONY: proddist
-
 release:
+	@echo "Building production site into $(PROD_DIST_DIR)"
+	@jekyll build --destination $(PROD_DIST_DIR) --baseurl $(PROD_BASE_URL)
+
 	@echo "Pushing $(PROD_DIST_DIR) contents to the upstream production branch"
 	@git subtree push --prefix $(PROD_DIST_DIR) $(PROD_REMOTE) $(PROD_BRANCH)
 .PHONY: release
diff --git a/README.md b/README.md
index 102e9b1..f673cc4 100644
--- a/README.md
+++ b/README.md
@@ -17,16 +17,7 @@ Please see [CONTRIBUTING.md] for the juicy details.
 
 # Make A New Release
 
-Our production site is contained in the [proddist folder]. You'll need to make
-sure you have the latest changes by running:
-
-```bash
-$ make proddist
-```
-
-If you see any unstaged changes, please verify them with someone and push them
-to the upstream master remote. Make sure the latest pipeline is passing and tag
-HEAD with:
+Firstly, you'll need to tag and push the latest HEAD with:
 
 ```bash
 $ git tag -a <YOUR-VERSION-NUMBER> $(git rev-parse HEAD)
@@ -38,9 +29,3 @@ Then make a release with:
 ```bash
 $ make release
 ```
-
-This pushes the contents of the [proddist folder] to the production
-branch which will get picked up by our production instance of
-the site.
-
-[proddist folder]: https://gitlab.com/autonomic-cooperative/autonomic-cooperative.gitlab.io/tree/master/proddist