X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Makefile;h=c3b36fc0d807e9ec89419e59f69f50732072ce84;hb=ab1417f604f130fd2b5544c6a3db106b58925536;hp=06c0cdbc0f696395ff99d1294ed484ba7c8969df;hpb=17bab8318f0a01cc4a60275f19a88c1f4d318f71;p=phdru.name%2Fphdru.name.git

diff --git a/Makefile b/Makefile
index 06c0cdb..c3b36fc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,43 @@
 # Makefile.
 #
 # This file is a part of phdru.name homepage/blog/news generator scripts.
-# Author: Oleg BroytMan <phd@phdru.name>.
-# Copyright: (C) 2006-2011 PhiloSoft Design.
 
-# __version__ = "$Revision$"[11:-2]
-# __revision__ = "$Id$"
-# __date__ = "$Date$"[7:-2]
 # __author__ = "Oleg Broytman <phd@phdru.name>"
-# __copyright__ = "Copyright (C) 2006-2011 PhiloSoft Design"
+# __copyright__ = "Copyright (C) 2006-2013 PhiloSoft Design"
 
 
 %.py: %.tmpl
 	umask 022; cheetah compile --nobackup $< && compyle $@
 
 %.html: %.tmpl
-	umask 022; PYTHONPATH=. cheetah fill --nobackup $<
+	umask 022; PYTHONPATH=. cheetah fill --nobackup --stdout $< | iconv -f utf-8 > $@
 
 
-.PHONY: phdru.name
-phdru.name: phd_site.py news blog html
+.PHONY: fast
+fast: news html
 
 
-.PHONY: news
-news: atom_10.py rss_20.py
-	(umask 022; PYTHONPATH=. ./make-news.py en ../htdocs/phdru.name/public_html && ./make-news.py ru ../htdocs/phdru.name/public_html/Russian)
+.PHONY: all
+all: phdru.name
+
+
+.PHONY: phdru.name
+phdru.name: news blog
 
 
 .PHONY: blog
-blog: atom_10.py rss_20.py
+blog: phd_site.py atom_10.py rss_20.py
 	./reindex_blog_ru
+	$(MAKE) html
 
 
-templates = $(shell find ../htdocs/phdru.name/public_html -type f -name \*.tmpl -print)
+templates = $(shell find ../htdocs/phdru.name -type f -name \*.tmpl -print)
 htmls = $(patsubst %.tmpl,%.html,$(templates))
 
 .PHONY: html
-html: $(htmls)
+html: phd_site.py $(htmls)
+
+
+.PHONY: news
+news: atom_10.py rss_20.py
+	(umask 022; PYTHONPATH=. ./make-news.py en ../htdocs/phdru.name && ./make-news.py ru ../htdocs/phdru.name/Russian)