Removed init_old.py.

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

diff --git a/Makefile b/Makefile
index 835200a66821d634a5cf337e0a625ed7d7d0423a..e5bcbd1e5f45556b12f7741358e81789c545533d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,34 @@
 # Makefile.
 #
 # This file is a part of phd.pp.ru homepage/blog/news generator scripts.
-# Author: Oleg BroytMann <phd@phd.pp.ru>.
-# Copyright: (C) 2006 PhiloSoft Design.
+# Author: Oleg BroytMan <phd@phd.pp.ru>.
+# Copyright: (C) 2006-2009 PhiloSoft Design.
 
 # __version__ = "$Revision$"[11:-2]
 # __revision__ = "$Id$"
 # __date__ = "$Date$"[7:-2]
-# __author__ = "Oleg Broytmann <phd@phd.pp.ru>"
-# __copyright__ = "Copyright (C) 2006 PhiloSoft Design"
+# __author__ = "Oleg Broytman <phd@phd.pp.ru>"
+# __copyright__ = "Copyright (C) 2006-2009 PhiloSoft Design"
 
 
+%.py: %.tmpl
+       @(umask 022; cheetah compile --nobackup $<)
+
 %.html: %.tmpl
-       @(umask 022; PYTHONPATH=.; export PYTHONPATH; cheetah fill --nobackup $<)
+       @(umask 022; PYTHONPATH=. cheetah fill --nobackup $<)
+
 
 .PHONY: phd.pp.ru
 phd.pp.ru: phd_pp_ru.py news blog html
 
 
-phd_pp_ru.py: phd_pp_ru.tmpl
-       @(umask 022; cheetah compile --nobackup $<)
-
-
 .PHONY: news
-news: ../htdocs/phd.pp.ru/news.tmpl ../htdocs/phd.pp.ru/Russian/news.tmpl
-
-../htdocs/phd.pp.ru/news.tmpl: news_en
-       @(umask 022; PYTHONPATH=.; export PYTHONPATH; ./make-news.py en ../htdocs/phd.pp.ru)
-
-../htdocs/phd.pp.ru/Russian/news.tmpl: news_ru
-       @(umask 022; PYTHONPATH=.; export PYTHONPATH; ./make-news.py ru ../htdocs/phd.pp.ru/Russian)
+news: atom_10.py rss_20.py
+       @(umask 022; PYTHONPATH=. ./make-news.py en ../htdocs/phd.pp.ru && ./make-news.py ru ../htdocs/phd.pp.ru/Russian)
 
 
 .PHONY: blog
-blog:
+blog: atom_10.py rss_20.py
        @./reindex_blog_ru