Generalized .tmpl => .py rule. Some shell-related cleanup.

git-svn-id: file:///home/phd/archive/SVN/phdru.name/scripts@30 7bb0bf08-9e0d-0410-b083-99cee3bf18b8

diff --git a/Makefile b/Makefile
index 835200a66821d634a5cf337e0a625ed7d7d0423a..253ab74a5002528a00cdbc60bba8f33ddeb3395a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,25 +11,25 @@
 # __copyright__ = "Copyright (C) 2006 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)
+       @(umask 022; 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)
+       @(umask 022; PYTHONPATH=. ./make-news.py ru ../htdocs/phd.pp.ru/Russian)
 
 
 .PHONY: blog