Skip to content

Commit 24517c9

Browse files
committed
Fix Go 1.4 release target
1 parent acb0a08 commit 24517c9

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

Makefile.am

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,11 @@ update-i18n:
134134
cd $(CURDIR)/src/i18n && $(MAKE) update
135135

136136
release-binary: GOPATH = "$(DIST):$(CURDIR)/vendor:$(CURDIR)"
137+
if GO_14
138+
release-binary: INTERNALLDFLAGS = -X main.version $(PACKAGE_VERSION) -X main.defaultConfig $(CONFIG_PATH)/$(CONFIG_FILE)
139+
else
137140
release-binary: INTERNALLDFLAGS = -X main.version=$(PACKAGE_VERSION) -X main.defaultConfig=$(CONFIG_PATH)/$(CONFIG_FILE)
141+
endif
138142
release-binary: OUTPUT = $(DIST_BIN)
139143
release-binary: dist_gopath $(DIST_BIN) binary
140144

configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ AM_CONDITIONAL([DEFAULT_VENDOR_GOPATH], [test x"${VENDOR_GOPATH}" == x""])
9595
AM_CONDITIONAL([READONLY_VENDOR_GOPATH], [test -n "${VENDOR_GOPATH}" -a ! -w "${VENDOR_GOPATH}"])
9696
AM_COND_IF(DEFAULT_VENDOR_GOPATH, [AC_SUBST(VENDOR_GOPATH, $PWD/vendor)])
9797
AC_MSG_RESULT([$VENDOR_GOPATH])
98+
AM_CONDITIONAL([GO_14], [test x"${GO_VERSION}" == x"1.4"])
9899

99100
AC_PATH_PROGS([NODEJS],[nodejs node])
100101
if test x"${NODEJS}" == x"" ; then

0 commit comments

Comments
 (0)