Чуть больше удобства для генерирования и выкладки сайта

diff --git a/Makefile b/Makefile
index d5ceac16a23ac8d82460fcf451e43cd498644a25..312f38f06a96ada558e61672a3ab7c1cc358bec5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,14 @@
 include Makefile.private
 
+html:
+       makeinfo --html -o out.html index.texi
+
 all:
-       makeinfo --html -o cypherpunks.ru.html index.texi
+       rm -rf out.html
+       makeinfo --html -o out.html index.texi
+       cd static ; tar cf - . | tar xfC - ../out.html
 
 update:
-       rsync -av --progress --delete cypherpunks.ru.html/* gw.stargrave.org:cypherpunks/
-       echo "mirror --delete --reverse cypherpunks.ru.html cypherpunks.ru/docs" | \
+       rsync -av --progress --delete out.html/ gw.stargrave.org:cypherpunks
+       echo "mirror --delete --reverse out.html cypherpunks.ru/docs" | \
                lftp -u $(FTP_MIRROR_LOGIN),$(FTP_MIRROR_PASSWORD) $(FTP_MIRROR_HOST)

diff --git a/cypherpunks.ru.html/.gitignore b/cypherpunks.ru.html/.gitignore
deleted file mode 100644 (file)
index 2d19fc7..0000000
--- a/cypherpunks.ru.html/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.html

diff --git a/cypherpunks.ru.html/.htaccess b/cypherpunks.ru.html/.htaccess
deleted file mode 100644 (file)
index c91ca1c..0000000
--- a/cypherpunks.ru.html/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-AddDefaultCharset utf-8