Respect BINDIR, INFODIR, DOCDIR

diff --git a/config b/config
index 92406c5d4458c5497d80614fd4b5547f37c71c35..66f5057811c153528af6c115cfd39b51f722230f 100644 (file)
--- 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 66f7e4a3903cfdfaaf18b0f03f22ba009f4e9603..c4ce41d4a408ead9657f51239e8142b8c15aec68 100644 (file)
--- 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 437e2ad352417c72c357b24774149775fbd3d1a3..a24704fe104f9fbe27eefe4f30d56a3b46dbe8c5 100644 (file)
--- 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 5fc64837c263f3545612260ee923e3029d3ea929..b351b25390fd2b1d526940de53d933eb730154ec 100644 (file)
--- 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)
 )