Move documentation to separate directory

diff --git a/cmds.texi b/doc/cmds.texi
similarity index 100%
rename from cmds.texi
rename to doc/cmds.texi

diff --git a/download.texi b/doc/download.texi
similarity index 100%
rename from download.texi
rename to doc/download.texi

diff --git a/faq.texi b/doc/faq.texi
similarity index 100%
rename from faq.texi
rename to doc/faq.texi

diff --git a/features.texi b/doc/features.texi
similarity index 100%
rename from features.texi
rename to doc/features.texi

diff --git a/goredo.info.do b/doc/goredo.info.do
similarity index 70%
rename from goredo.info.do
rename to doc/goredo.info.do
index 93ac3950f1da361c07a448a99664b0765b28a3a7..cd1dddef62cbc8c0acd0b05becea980a345d8f68 100644 (file)
--- a/goredo.info.do
+++ b/doc/goredo.info.do
@@ -1,6 +1,6 @@
-redo-ifchange *.texi VERSION
+redo-ifchange *.texi ../VERSION
 ${MAKEINFO:-makeinfo} \
-    -D "VERSION `cat VERSION`" \
+    -D "VERSION `cat ../VERSION`" \
     --set-customization-variable CLOSE_QUOTE_SYMBOL=\" \
     --set-customization-variable OPEN_QUOTE_SYMBOL=\" \
     --output $3 goredo.texi

diff --git a/goredo.texi b/doc/goredo.texi
similarity index 100%
rename from goredo.texi
rename to doc/goredo.texi

diff --git a/install.texi b/doc/install.texi
similarity index 98%
rename from install.texi
rename to doc/install.texi
index e8dc4b5236e0dfdc4d70f4d72a2794561db9653f..b25603bdaceae644fbc8bb7f85f7596306f7523b 100644 (file)
--- a/install.texi
+++ b/doc/install.texi
@@ -40,7 +40,7 @@ $ gpg --auto-key-locate wkd --locate-keys goredo at cypherpunks dot ru
 @end example
 
 @item
-@verbatiminclude PUBKEY.asc
+@verbatiminclude ../PUBKEY.asc
 
 @end itemize
 

diff --git a/news.texi b/doc/news.texi
similarity index 100%
rename from news.texi
rename to doc/news.texi

diff --git a/notes.texi b/doc/notes.texi
similarity index 100%
rename from notes.texi
rename to doc/notes.texi

diff --git a/state.texi b/doc/state.texi
similarity index 100%
rename from state.texi
rename to doc/state.texi

diff --git a/makedist.sh b/makedist.sh
index 3353af22fd5ec751463daab7901fdde1b790228f..e891eca22527f9d04310ab02e98ffd8fe5bc3481 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -13,17 +13,17 @@ redo-ifchange module-name VERSION
 mod_name=`cat module-name`
 
 ########################################################################
+cd doc
 cat > download.texi <<EOF
 You can obtain releases source code prepared tarballs on
 @url{http://www.goredo.cypherpunks.ru/}.
 EOF
-redo goredo.info
 
 mkinfo() {
     ${MAKEINFO:-makeinfo} --plaintext \
         --set-customization-variable CLOSE_QUOTE_SYMBOL=\" \
         --set-customization-variable OPEN_QUOTE_SYMBOL=\" \
-        -D "VERSION `cat VERSION`" $@
+        -D "VERSION `cat ../VERSION`" $@
 }
 
 texi=$(mktemp)
@@ -46,10 +46,13 @@ cat > $texi <<EOF
 @include install.texi
 @bye
 EOF
-perl -i -p -e "s/.verbatiminclude PUBKEY.asc/Look in PUBKEY.asc file./" install.texi
+perl -i -p -e "s/.verbatiminclude .*PUBKEY.asc/Look in PUBKEY.asc file./" install.texi
 mkinfo --output INSTALL $texi
 
 rm $texi
+redo goredo.info
+mv goredo.info NEWS INSTALL ..
+cd ..
 
 ########################################################################
 
@@ -98,7 +101,7 @@ mv $tmp/golang.org src
 
 ########################################################################
 
-rm -rf *.texi .redo .git .gitignore makedist.sh goredo.info.do module-name* VERSION.do
+rm -rf *.texi .redo .git .gitignore doc makedist.sh module-name* VERSION.do
 find . -type d -exec chmod 755 {} \;
 find . -type f -exec chmod 644 {} \;
 
@@ -119,7 +122,7 @@ An entry for documentation:
 @tab @code{$hash}
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".sig $cur/goredo.html/download
+mv $tmp/$tarball $tmp/"$tarball".sig $cur/doc/goredo.html/download
 
 cat <<EOF
 Subject: goredo $release release announcement