Refactor update script

[phdru.name/phdru.name.git] / Makefile

diff --git a/Makefile b/Makefile
index 303c42d2d3d11eb1bae518e325ac039dcc622a5f..c3b36fc0d807e9ec89419e59f69f50732072ce84 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,16 @@
 # 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: fast
@@ -31,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
@@ -45,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)