From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 1 May 2019 20:00:41 +0000 (+0300)
Subject: Determine go.mod support and corresponding envvars
X-Git-Tag: 4.1^2
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=64bc05b333e92ef673481fdc977b5afd4ea7803e;p=nncp.git

Determine go.mod support and corresponding envvars
---

diff --git a/BSDmakefile b/BSDmakefile
index 63c724c..12bf97a 100644
--- 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 5af4eb0..1bcb1be 100644
--- 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 5186d07..7d5c902 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0
+4.1
diff --git a/common.mk b/common.mk
index 602d754..6c887a5 100644
--- 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 b4df484..db3be1d 100644
--- 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 a17c2ef..25865b7 100644
--- 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 ed1bf08..839effc 100644
--- 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