From: Sergey Matveev <stargrave@stargrave.org>
Date: Tue, 31 Jan 2017 08:47:53 +0000 (+0300)
Subject: Plaintext INSTALL
X-Git-Tag: 0.5^2~2
X-Git-Url: http://www.git.cypherpunks.ru/?p=nncp.git;a=commitdiff_plain;h=4e2b8c63eab68ac512e7a3ded08f6551903591a8

Plaintext INSTALL
---

diff --git a/INSTALL b/INSTALL
deleted file mode 120000
index a4292cb..0000000
--- a/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-doc/install.texi
\ No newline at end of file
diff --git a/doc/integrity.texi b/doc/integrity.texi
index baa8765..a88f1b2 100644
--- a/doc/integrity.texi
+++ b/doc/integrity.texi
@@ -18,9 +18,6 @@ uid   NNCP releases <releases at nncpgo dot org>
 
 @itemize
 
-@item This website @ref{Contacts, alternates} and maillist containing
-public key fingerprint.
-
 @item
 @verbatim
 % gpg --keyserver hkp://keys.gnupg.net/ --recv-keys 0x2B25868E75A1A953
diff --git a/makedist.sh b/makedist.sh
index 552920b..f6a8f0e 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -71,8 +71,8 @@ You can obtain releases source code prepared tarballs on
 @url{http://www.nncpgo.org/}.
 EOF
 make -C doc
-./news.sh
-rm -r doc/.well-known doc/nncp.html/.well-known news.sh
+./news_and_install.sh
+rm -r doc/.well-known doc/nncp.html/.well-known news_and_install.sh
 
 find . -name .git -type d | xargs rm -fr
 find . -name .gitignore -delete
diff --git a/news.sh b/news.sh
deleted file mode 100755
index 78e9e00..0000000
--- a/news.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-texi=`mktemp`
-cat > $texi <<EOF
-\input texinfo
-@documentencoding UTF-8
-@settitle NEWS
-
-`cat doc/news.texi`
-
-@bye
-EOF
-makeinfo --plaintext -o NEWS $texi
-rm -f $texi
diff --git a/news_and_install.sh b/news_and_install.sh
new file mode 100755
index 0000000..8129fc7
--- /dev/null
+++ b/news_and_install.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+texi=`mktemp`
+cat > $texi <<EOF
+\input texinfo
+@documentencoding UTF-8
+@settitle NEWS
+
+`cat doc/news.texi`
+
+@bye
+EOF
+makeinfo --plaintext -o NEWS $texi
+rm -f $texi
+
+texi=$(TMPDIR=doc mktemp)
+cat > $texi <<EOF
+\input texinfo
+@documentencoding UTF-8
+@settitle INSTALL
+
+@include install.texi
+
+@bye
+EOF
+makeinfo --plaintext -o INSTALL $texi
+rm -f $texi