From 2d19831dbe73a14cf6f699e8e76a942cc5535ffb Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Wed, 4 Oct 2017 16:58:07 +0200 Subject: [PATCH] Clean up Makefile to not break for everyone. --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a4cd356..cbbc23c 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,19 @@ -DEV_DIST_DIR:=./dist/ -PROD_DIST_DIR:=./proddist/ +DEV_DIST_DIR:=dist +PROD_DIST_DIR:=proddist +PROD_REMOTE:=git@gitlab.com:autonomic-cooperative/autonomic-cooperative.gitlab.io.git +PROD_BRANCH:=production 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 "Pushing $(PROD_DIST_DIR) contents to the upstream production branch" - @git subtree push --prefix dist upstream production + @git subtree push --prefix $(PROD_DIST_DIR) $(PROD_REMOTE) $(PROD_BRANCH) +.PHONY: release