X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Makefile;h=c3b36fc0d807e9ec89419e59f69f50732072ce84;hb=c1a994b2cce5060f46bb89094a49017a4dd8929a;hp=23d23f55f1f0712cd0c02b6eaa0cff9e9aa1d21f;hpb=17ba3d2cde1d5f71d7d730536b5d79d8bfcb1690;p=phdru.name%2Fphdru.name.git

diff --git a/Makefile b/Makefile
index 23d23f5..c3b36fc 100644
--- a/Makefile
+++ b/Makefile
@@ -3,14 +3,14 @@
 # This file is a part of phdru.name homepage/blog/news generator scripts.
 
 # __author__ = "Oleg Broytman <phd@phdru.name>"
-# __copyright__ = "Copyright (C) 2006-2012 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: fast
@@ -26,12 +26,12 @@ 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
@@ -40,4 +40,4 @@ html: phd_site.py $(htmls)
 
 .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)
+	(umask 022; PYTHONPATH=. ./make-news.py en ../htdocs/phdru.name && ./make-news.py ru ../htdocs/phdru.name/Russian)