Clean up Makefile to not break for everyone.

This commit is contained in:
Luke Murphy 2017-10-04 16:58:07 +02:00
parent f22dc42049
commit 2d19831dbe
No known key found for this signature in database
GPG Key ID: 5E2EF5A63E3718CC

View File

@ -1,14 +1,19 @@
DEV_DIST_DIR:=./dist/ DEV_DIST_DIR:=dist
PROD_DIST_DIR:=./proddist/ PROD_DIST_DIR:=proddist
PROD_REMOTE:=git@gitlab.com:autonomic-cooperative/autonomic-cooperative.gitlab.io.git
PROD_BRANCH:=production
devserver: devserver:
@echo "Serving development site from $(DEV_DIST_DIR)" @echo "Serving development site from $(DEV_DIST_DIR)"
@jekyll serve --watch --incremental --destination $(DEV_DIST_DIR) @jekyll serve --watch --incremental --destination $(DEV_DIST_DIR)
.PHONY: devserver
proddist: proddist:
@echo "Building production site into $(PROD_DIST_DIR)" @echo "Building production site into $(PROD_DIST_DIR)"
@jekyll build --destination $(PROD_DIST_DIR) @jekyll build --destination $(PROD_DIST_DIR)
.PHONY: proddist
release: release:
@echo "Pushing $(PROD_DIST_DIR) contents to the upstream production branch" @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