From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 4 Nov 2015 12:20:28 +0000 (+0300)
Subject: Чуть больше удобства для генерирования и выкладки сайта
X-Git-Url: http://www.git.cypherpunks.ru/?a=commitdiff_plain;h=9b0c992028aed5a4202f6d328dcee9d6115e0edd;p=cypherpunks-www.git

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

diff --git a/Makefile b/Makefile
index d5ceac1..312f38f 100644
--- 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
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
index c91ca1c..0000000
--- a/cypherpunks.ru.html/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-AddDefaultCharset utf-8