Browse Source

Fix Go 1.4 release target

release-0.28
Simon Eisenmann 9 years ago
parent
commit
24517c9a91
  1. 4
      Makefile.am
  2. 1
      configure.ac

4
Makefile.am

@ -134,7 +134,11 @@ update-i18n:
cd $(CURDIR)/src/i18n && $(MAKE) update cd $(CURDIR)/src/i18n && $(MAKE) update
release-binary: GOPATH = "$(DIST):$(CURDIR)/vendor:$(CURDIR)" 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) release-binary: INTERNALLDFLAGS = -X main.version=$(PACKAGE_VERSION) -X main.defaultConfig=$(CONFIG_PATH)/$(CONFIG_FILE)
endif
release-binary: OUTPUT = $(DIST_BIN) release-binary: OUTPUT = $(DIST_BIN)
release-binary: dist_gopath $(DIST_BIN) binary release-binary: dist_gopath $(DIST_BIN) binary

1
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_CONDITIONAL([READONLY_VENDOR_GOPATH], [test -n "${VENDOR_GOPATH}" -a ! -w "${VENDOR_GOPATH}"])
AM_COND_IF(DEFAULT_VENDOR_GOPATH, [AC_SUBST(VENDOR_GOPATH, $PWD/vendor)]) AM_COND_IF(DEFAULT_VENDOR_GOPATH, [AC_SUBST(VENDOR_GOPATH, $PWD/vendor)])
AC_MSG_RESULT([$VENDOR_GOPATH]) AC_MSG_RESULT([$VENDOR_GOPATH])
AM_CONDITIONAL([GO_14], [test x"${GO_VERSION}" == x"1.4"])
AC_PATH_PROGS([NODEJS],[nodejs node]) AC_PATH_PROGS([NODEJS],[nodejs node])
if test x"${NODEJS}" == x"" ; then if test x"${NODEJS}" == x"" ; then

Loading…
Cancel
Save