X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Makefile;h=7e55241f5af99b543138fed26daef4b64ecb7542;hb=5f0a5a57cec7afdde0944c806ccbd67bfdfa2759;hp=2729cbc1102f561fd73390482c6c4fab53e53c20;hpb=42fb7aee39e33a28ea1988f41865278501f5e21f;p=phdru.name%2Fphdru.name.git

diff --git a/Makefile b/Makefile
index 2729cbc..7e55241 100644
--- a/Makefile
+++ b/Makefile
@@ -3,14 +3,18 @@
 # This file is a part of phdru.name homepage/blog/news generator scripts.
 
 # __author__ = "Oleg Broytman <phd@phdru.name>"
-# __copyright__ = "Copyright (C) 2006-2012 PhiloSoft Design"
+# __copyright__ = "Copyright (C) 2006-2017 PhiloSoft Design"
+
+
+.SUFFIXES: # Clear the suffix list
+.SUFFIXES: .py .tmpl .html
 
 
 %.py: %.tmpl
-	umask 022; cheetah compile --nobackup $< && compyle $@
+	umask 022; cheetah compile --encoding=koi8-r --settings='encoding="koi8-r"' --nobackup $< && compyle $@
 
 %.html: %.tmpl
-	umask 022; PYTHONPATH=. cheetah fill --nobackup --stdout $< | iconv -f utf-8 > $@
+	umask 022; PYTHONPATH=. PYTHONIOENCODING=koi8-r:replace cheetah fill --encoding=koi8-r --settings='encoding="koi8-r"' --nobackup --stdout $< | iconv -f utf-8 -t koi8-r >$@
 
 
 .PHONY: fast
@@ -26,18 +30,28 @@ 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)
+allfiles = $(shell find ../htdocs/phdru.name -type f ! -name sitemap.xml -print)
+templates = $(shell find ../htdocs/phdru.name -type f -name \*.tmpl -print)
 htmls = $(patsubst %.tmpl,%.html,$(templates))
 
 .PHONY: html
-html: phd_site.py $(htmls)
+html: phd_site.py $(htmls) sitemap
 
 
 .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)
+
+
+SITEMAP = ../htdocs/phdru.name/sitemap.xml
+
+.PHONY: sitemap
+sitemap: $(SITEMAP)
+
+$(SITEMAP): $(allfiles)
+	sitemap_gen.py --config=sitemaps/phdru.name-config.xml