From: Sergey Matveev <stargrave@stargrave.org>
Date: Mon, 11 Jan 2021 12:12:37 +0000 (+0300)
Subject: Respect BINDIR, INFODIR, DOCDIR
X-Git-Tag: v5.5.1^2
X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=commitdiff_plain;h=2ed9d422314edb2d32f9e23ac39fc5d180d8b1f8

Respect BINDIR, INFODIR, DOCDIR
---

diff --git a/config b/config
index 92406c5..66f5057 100644
--- a/config
+++ b/config
@@ -9,6 +9,6 @@ CFGPATH=${CFGPATH:-$PREFIX/etc/nncp.hjson}
 SPOOLPATH=${SPOOLPATH:-/var/spool/nncp}
 LOGPATH=${LOGPATH:-/var/spool/nncp/log}
 
-BINDIR=${DESTDIR}${PREFIX}/bin
-INFODIR=${DESTDIR}${PREFIX}/info
-DOCDIR=${DESTDIR}${PREFIX}/share/doc/nncp
+BINDIR=${BINDIR:-${DESTDIR}${PREFIX}/bin}
+INFODIR=${INFODIR:-${DESTDIR}${PREFIX}/info}
+DOCDIR=${DOCDIR:-${DESTDIR}${PREFIX}/share/doc/nncp}
diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 66f7e4a..c4ce41d 100644
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,16 @@
 @node Новости
 @section Новости
 
+@node Релиз 5.5.1
+@subsection Релиз 5.5.1
+@itemize
+
+@item
+Уважать @env{BINDIR}, @env{INFODIR} и @env{DOCDIR} переменные окружения
+в @file{config} во время установки.
+
+@end itemize
+
 @node Релиз 5.5.0
 @subsection Релиз 5.5.0
 @itemize
diff --git a/doc/news.texi b/doc/news.texi
index 437e2ad..a24704f 100644
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,16 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 5.5.1
+@section Release 5.5.1
+@itemize
+
+@item
+Respect for @env{BINDIR}, @env{INFODIR} and @env{DOCDIR} environment
+variables in @file{config} during installation.
+
+@end itemize
+
 @node Release 5.5.0
 @section Release 5.5.0
 @itemize
diff --git a/src/nncp.go b/src/nncp.go
index 5fc6483..b351b25 100644
--- a/src/nncp.go
+++ b/src/nncp.go
@@ -38,7 +38,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.`
 )
 
 var (
-	Version string = "5.5.0"
+	Version string = "5.5.1"
 
 	Base32Codec *base32.Encoding = base32.StdEncoding.WithPadding(base32.NoPadding)
 )