Merge branch 'release-0.28'

.travis.yml

@@ -38,3 +38,4 @@ script:
   - make test
   - make binary
   - make build-i18n
+  - make tarball

Makefile.am

@@ -88,9 +88,9 @@ test:
 	GOPATH=$(GOPATH) $(GO) test -v $(GOTESTFLAGS) app/... ./go/...
 
 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
 
@@ -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
 

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