From ec648595c431385b601a317ca73de191bd4adb91 Mon Sep 17 00:00:00 2001
From: Jaeho Shin <netj@cs.stanford.edu>
Date: Thu, 18 Feb 2016 19:23:49 -0800
Subject: [PATCH] Fixes make release-* to respect existing tags

and use coffee and node bundled in mindbender to talk to GitHub with util/build/upload-github-release-asset
---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 40a3d8757..b5a517c51 100644
--- a/Makefile
+++ b/Makefile
@@ -41,11 +41,13 @@ $(PACKAGE): build
 # util/install/ can then download and install the binary release directly
 # without building the source tree.
 
+# XXX put coffee and node from mindbender on PATH
+release-%: PATH := $(realpath $(STAGE_DIR)/mindbender/node_modules/.bin):$(realpath $(STAGE_DIR)/mindbender/depends/bundled/.all/bin):$(PATH)
 release-%: GITHUB_REPO = HazyResearch/deepdive
 release-%: RELEASE_VERSION = $*
 release-%: RELEASE_PACKAGE = deepdive-$(RELEASE_VERSION)-$(shell uname).tar.gz
 release-%:
-	git tag --annotate --force $(RELEASE_VERSION)
+	-git tag --annotate $(RELEASE_VERSION) --cleanup=whitespace
 	$(MAKE) RELEASE_VERSION=$(RELEASE_VERSION) $(PACKAGE)
 	ln -sfn $(PACKAGE) $(RELEASE_PACKAGE)
 	# Releasing $(RELEASE_PACKAGE) to GitHub