X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Makefile;h=f3909120a78746264df3adb891932a4a96471345;hb=HEAD;hp=def5c6ca184f757537f7087859943154fb7962f9;hpb=e4d529b9ee404a8ee0e4b7b1ddc2bcf338b4efcd;p=phdru.name%2Fphdru.name.git

diff --git a/Makefile b/Makefile
index def5c6c..36cb849 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,10 @@
 
 
 %.py: %.tmpl
-	umask 022; python2.7 `which cheetah` compile --encoding=koi8-r --settings='encoding="koi8-r"' --nobackup $< && compyle $@ && chmod +x $@
+	umask 022; python3 -m Cheetah.CheetahWrapper compile --encoding=koi8-r --settings='encoding="koi8-r"' --nobackup $< && python3 -m compileall $@ && chmod +x $@
 
 %.html: %.tmpl phd.py phd_site.py
-	umask 022; PYTHONPATH=. PYTHONIOENCODING=koi8-r:replace python2.7 `which cheetah` fill --encoding=koi8-r --settings='encoding="koi8-r"' --nobackup --stdout $< | iconv -c -f utf-8 -t koi8-r >$@
+	umask 022; PYTHONPATH=. PYTHONIOENCODING=koi8-r:replace python3 -m Cheetah.CheetahWrapper fill --encoding=koi8-r --settings='encoding="koi8-r"' --nobackup $<
 
 
 .PHONY: fast
@@ -81,3 +81,7 @@ special-templates: ../htdocs/phdru.name/Russian/Software/instant-messengers/inst
 .PHONY: clean-html
 clean-html:
 	find ../htdocs/phdru.name/ -type f -name \*.html -delete
+
+.PHONY: clean-blog
+clean-blog:
+	find ../htdocs/phdru.name/Russian/blog -type f -name \*.html -delete