From 0c39bcd73bb028832fea8580117400f950d9c753 Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Fri, 12 Aug 2016 17:00:14 +0200
Subject: [PATCH 1/4] Add make tarball to travis

This also checks the release make targets, as those use parameters which currently are broken with Go 1.4 :/
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 3fe27556..d319dd30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,3 +38,4 @@ script:
   - make test
   - make binary
   - make build-i18n
+  - make tarball

From ea731b8a54bd4319a2ec5d15ac57a85dc4759a66 Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Fri, 12 Aug 2016 17:14:31 +0200
Subject: [PATCH 2/4] Check if system GOPATH exists

---
 Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 82c124db..75b676d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,9 +88,9 @@ test:
 	GOPATH=$(GOPATH) $(GO) test -v $(GOTESTFLAGS) app/... ./go/...
 
 dist_gopath: $(DIST_SRC)
-	find $(SYSTEM_GOPATH) -mindepth 1 -maxdepth 1 -type d \
-		-exec ln -sf {} $(DIST_SRC) \;
-
+	[ -d $(SYSTEM_GOPATH) ] && \
+		find $(SYSTEM_GOPATH) -mindepth 1 -maxdepth 1 -type d \
+			-exec ln -sf {} $(DIST_SRC) \;
 
 assets: javascript fonts
 

From acb0a08c29a788b2d2aad7267a426e12b4e5bb17 Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Fri, 12 Aug 2016 17:27:46 +0200
Subject: [PATCH 3/4] Allow dist_gopath to fail

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 75b676d5..3d3d7cbf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,7 +90,7 @@ test:
 dist_gopath: $(DIST_SRC)
 	[ -d $(SYSTEM_GOPATH) ] && \
 		find $(SYSTEM_GOPATH) -mindepth 1 -maxdepth 1 -type d \
-			-exec ln -sf {} $(DIST_SRC) \;
+			-exec ln -sf {} $(DIST_SRC) \; || true
 
 assets: javascript fonts
 

From 24517c9a914dea360537a9ce7c6bd68fce7ce513 Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Fri, 12 Aug 2016 18:00:38 +0200
Subject: [PATCH 4/4] Fix Go 1.4 release target

---
 Makefile.am  | 4 ++++
 configure.ac | 1 +
 2 files changed, 5 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 3d3d7cbf..533b1b12 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -134,7 +134,11 @@ update-i18n:
 	cd $(CURDIR)/src/i18n && $(MAKE) update
 
 release-binary: GOPATH = "$(DIST):$(CURDIR)/vendor:$(CURDIR)"
+if GO_14
+release-binary: INTERNALLDFLAGS = -X main.version $(PACKAGE_VERSION) -X main.defaultConfig $(CONFIG_PATH)/$(CONFIG_FILE)
+else
 release-binary: INTERNALLDFLAGS = -X main.version=$(PACKAGE_VERSION) -X main.defaultConfig=$(CONFIG_PATH)/$(CONFIG_FILE)
+endif
 release-binary: OUTPUT = $(DIST_BIN)
 release-binary: dist_gopath $(DIST_BIN) binary
 
diff --git a/configure.ac b/configure.ac
index e9b14cfe..ef0de601 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,6 +95,7 @@ AM_CONDITIONAL([DEFAULT_VENDOR_GOPATH], [test x"${VENDOR_GOPATH}" == x""])
 AM_CONDITIONAL([READONLY_VENDOR_GOPATH], [test -n "${VENDOR_GOPATH}" -a ! -w "${VENDOR_GOPATH}"])
 AM_COND_IF(DEFAULT_VENDOR_GOPATH, [AC_SUBST(VENDOR_GOPATH, $PWD/vendor)])
 AC_MSG_RESULT([$VENDOR_GOPATH])
+AM_CONDITIONAL([GO_14], [test x"${GO_VERSION}" == x"1.4"])
 
 AC_PATH_PROGS([NODEJS],[nodejs node])
 if test x"${NODEJS}" == x"" ; then