Determine go.mod support and corresponding envvars

diff --git a/BSDmakefile b/BSDmakefile
index 63c724c3499450e58a502112a4e7176cd1ede947..12bf97ac0211f22c59428ea0637c3230bd51bd7e 100644 (file)
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -1,3 +1,14 @@
 VERSION != cat VERSION
+GO ?= go
+
+GO_MOD_EXISTS != $(GO) help mod >/dev/null 2>&1 || echo no
+
+.if ${GO_MOD_EXISTS} == "no"
+BUILDMOD ?=
+GOPATH ?= $(PWD)
+.else
+BUILDMOD ?= -mod=vendor
+GOPATH ?= $(PWD)/gopath
+.endif
 
 include common.mk

diff --git a/GNUmakefile b/GNUmakefile
index 5af4eb08aa90362082b1816f2f27554e8a2b7d7c..1bcb1be686401b7fd212d8d14549402f7b25c670 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,3 +1,14 @@
 VERSION = $(shell cat VERSION)
+GO ?= go
+
+GO_MOD_EXISTS = $(shell $(GO) help mod >/dev/null 2>&1 || echo no)
+
+ifeq ($(GO_MOD_EXISTS), no)
+BUILDMOD ?=
+GOPATH ?= $(PWD)
+else
+BUILDMOD ?= -mod=vendor
+GOPATH ?= $(PWD)/gopath
+endif
 
 include common.mk

diff --git a/VERSION b/VERSION
index 5186d07068cfed4c3f4705df79c73e115dd35c43..7d5c902e777905446c67de7e52a945b88fd2038c 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0
+4.1

diff --git a/common.mk b/common.mk
index 602d754be0f7f9fabb8e0b00fe15f466e3db9884..6c887a56e2ecf7165f66af0fa7df60646aabee41 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -1,5 +1,4 @@
 PREFIX ?= /usr/local
-GO ?= go
 
 SENDMAIL ?= /usr/sbin/sendmail
 CFGPATH ?= $(PREFIX)/etc/nncp.yaml
@@ -16,7 +15,6 @@ LDFLAGS = \
        -X cypherpunks.ru/nncp.DefaultSendmailPath=$(SENDMAIL) \
        -X cypherpunks.ru/nncp.DefaultSpoolPath=$(SPOOLPATH) \
        -X cypherpunks.ru/nncp.DefaultLogPath=$(LOGPATH)
-BUILDMOD ?= -mod=vendor
 
 ALL = \
        nncp-bundle \
@@ -40,7 +38,6 @@ ALL = \
 
 SRC := $(PWD)/src/cypherpunks.ru/nncp
 BIN := $(PWD)/bin
-GOPATH ?= $(PWD)/gopath
 
 all: $(ALL)
 

diff --git a/doc/install.texi b/doc/install.texi
index b4df48425ff61ab3b826b1c673ca9d1d5e72b5d0..db3be1dd3354524009533033380cce700c4bedf1 100644 (file)
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -11,7 +11,7 @@ Possibly NNCP package already exists for your distribution:
 NNCP should run on any POSIX-compatible operating system.
 
 NNCP is written on @url{https://golang.org/, Go} programming language
-and you have to install Go compiler (1.7+ version is highly
+and you have to install Go compiler (1.10+ version is highly
 recommended). @emph{Make} (BSD and GNU ones are fine) is recommended for
 convenient building. @url{https://www.gnu.org/software/texinfo/,
 Texinfo} is used for building documentation.

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index a17c2efa0a73405d7af8a896e43ef993b3d2a1de..25865b770e65f091420be964a273ee72a388159e 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,13 @@
 @node Новости
 @section Новости
 
+@node Релиз 4.1
+@subsection Релиз 4.1
+@itemize
+@item
+Восстановлена работоспособность на GNU/Linux системах и Go версии 1.10.
+@end itemize
+
 @node Релиз 4.0
 @subsection Релиз 4.0
 @itemize

diff --git a/doc/news.texi b/doc/news.texi
index ed1bf0839333802891b7cff8d32ddae98c6dd562..839effc005f6fe99d20d0f8f42b38e963a4dddc8 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,13 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 4.1
+@section Release 4.1
+@itemize
+@item
+Workability on GNU/Linux systems and Go 1.10 is fixed.
+@end itemize
+
 @node Release 4.0
 @section Release 4.0
 @itemize