X-Git-Url: https://git.phdru.name/?p=phdru.name%2Fphdru.name.git;a=blobdiff_plain;f=Makefile;h=5a50472edadf6ec17884144595ad8a946cca84d3;hp=835200a66821d634a5cf337e0a625ed7d7d0423a;hb=de7b8fd4faef91c9cb69be86e18697752ef89fe5;hpb=47b0884966fe1dfa14dea026a3811e0088a9214f

diff --git a/Makefile b/Makefile
index 835200a..5a50472 100644
--- a/Makefile
+++ b/Makefile
@@ -1,44 +1,43 @@
 # 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.
 
-# __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-2013 PhiloSoft Design"
 
 
-%.html: %.tmpl
-	@(umask 022; PYTHONPATH=.; export PYTHONPATH; cheetah fill --nobackup $<)
+%.py: %.tmpl
+	umask 022; cheetah compile --nobackup $< && compyle $@
 
-.PHONY: phd.pp.ru
-phd.pp.ru: phd_pp_ru.py news blog html
+%.html: %.tmpl
+	umask 022; PYTHONPATH=. cheetah fill --nobackup --stdout $< | iconv -f utf-8 > $@
 
 
-phd_pp_ru.py: phd_pp_ru.tmpl
-	@(umask 022; cheetah compile --nobackup $<)
+.PHONY: fast
+fast: news html
 
 
-.PHONY: news
-news: ../htdocs/phd.pp.ru/news.tmpl ../htdocs/phd.pp.ru/Russian/news.tmpl
+.PHONY: all
+all: phdru.name
 
-../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)
+.PHONY: phdru.name
+phdru.name: news blog
 
 
 .PHONY: blog
-blog:
-	@./reindex_blog_ru
+blog: phd_site.py atom_10.py rss_20.py
+	./reindex_blog_ru
+	$(MAKE) html
 
 
-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
-html: $(htmls)
+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)