X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Makefile;h=36cb84960aeebddb35b06957a6c1c135debe887f;hb=323f453596659c754a438a3c9cf7066872585318;hp=f3909120a78746264df3adb891932a4a96471345;hpb=e05121e618d19083c3626cf53cf74a2232d4c2da;p=phdru.name%2Fphdru.name.git

diff --git a/Makefile b/Makefile
index f390912..36cb849 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # This file is a part of phdru.name homepage/blog/news generator scripts.
 
 # __author__ = "Oleg Broytman <phd@phdru.name>"
-# __copyright__ = "Copyright (C) 2006-2017 PhiloSoft Design"
+# __copyright__ = "Copyright (C) 2006-2024 PhiloSoft Design"
 
 
 .SUFFIXES: # Clear the suffix list
@@ -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
@@ -77,3 +77,11 @@ special-templates: ../htdocs/phdru.name/Russian/Software/instant-messengers/inst
 	   -e 's/<div class="section" id="ii">/<lj-cut text="îÉËÔÏ ÎÅ ÏÂÅÝÁÌ ÒÁÊÓËÏÇÏ ÓÁÄÁ...">&/' \
 	   -e '/<hr width="90%">/,$$d' $< | sed '1,2d'; \
 	  echo '</lj-cut>'; } >$@
+
+.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