Plaintext INSTALL

diff --git a/INSTALL b/INSTALL
deleted file mode 120000 (symlink)
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 baa8765a7be6448e5d1fc83285b22e5e5a2aad9b..a88f1b2744de8abbee0e6e05d330db1563ad29ca 100644 (file)
--- 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 552920b2c47c0e3c3b4e0200e6b9e87dc8a8972b..f6a8f0e0df0d1d7c43e823fc6fe89e35196f2561 100755 (executable)
--- 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 (executable)
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 (executable)
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