X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Makefile;h=be2792032c23f5a4ad6cb93dd3469638d72adf51;hb=42465be8abac2fdb32c939bc7e5ad0fbca5df2f8;hp=3e4ba3710dddbbfa36b19583f2965126d68902dc;hpb=258947e263dc68d972e704b02b4a8b6b1c3d4b1c;p=phdru.name%2Fphdru.name.git

diff --git a/Makefile b/Makefile
index 3e4ba37..be27920 100644
--- a/Makefile
+++ b/Makefile
@@ -1,43 +1,38 @@
 # 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.
+# This file is a part of phdru.name homepage/blog/news generator scripts.
+# Author: Oleg BroytMan <phd@phdru.name>.
+# Copyright: (C) 2006-2010 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@phdru.name>"
+# __copyright__ = "Copyright (C) 2006-2010 PhiloSoft Design"
 
 
-%.html: %.tmpl
-	@(umask 022; PYTHONPATH=.; export PYTHONPATH; cheetah fill --nobackup $<)
+%.py: %.tmpl
+	@(umask 022; cheetah compile --nobackup $<)
 
-.PHONY: phd.pp.ru
-phd.pp.ru: phd_pp_ru.py news blog html
+%.html: %.tmpl
+	@(umask 022; PYTHONPATH=. cheetah fill --nobackup $<)
 
 
-phd_pp_ru.py: phd_pp_ru.tmpl
-	@(umask 022; cheetah compile --nobackup $<)
+.PHONY: phdru.name
+phdru.name: phd_site.py news blog html
 
 
 .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/news.tmpl)
-
-../htdocs/phd.pp.ru/Russian/news.tmpl: news_ru
-	@(umask 022; PYTHONPATH=.; export PYTHONPATH; ./make-news.py ru Russian ../htdocs/phd.pp.ru/Russian/news.tmpl)
+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: blog
-blog:
+blog: atom_10.py rss_20.py
 	@./reindex_blog_ru
 
 
-templates = $(shell find ../htdocs/phd.pp.ru -type f -name \*.tmpl -print)
+templates = $(shell find ../htdocs/phdru.name/public_html -type f -name \*.tmpl -print)
 htmls = $(patsubst %.tmpl,%.html,$(templates))
 
 .PHONY: html