X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=Makefile;h=506436311a8e6ee7bc6640afbc953358f6a0bd3d;hb=HEAD;hp=907ee0a69415f50e3532d2b14e7794fde2c424fa;hpb=ce74db252dac9d7504900944ae0dd7b2d840a5df;p=phdru.name%2Fphdru.name.git

diff --git a/Makefile b/Makefile
index 907ee0a..f390912 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,10 @@
 
 
 %.py: %.tmpl
-	umask 022; cheetah compile --encoding=koi8-r --settings='encoding="koi8-r"' --nobackup $< && compyle $@ && chmod +x $@
+	umask 022; python2.7 `which cheetah` compile --encoding=koi8-r --settings='encoding="koi8-r"' --nobackup $< && compyle $@ && chmod +x $@
 
-%.html: %.tmpl
-	umask 022; PYTHONPATH=. PYTHONIOENCODING=koi8-r:replace cheetah fill --encoding=koi8-r --settings='encoding="koi8-r"' --nobackup --stdout $< | iconv -c -f utf-8 -t koi8-r >$@
+%.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 >$@
 
 
 .PHONY: fast
@@ -30,7 +30,7 @@ phdru.name: blog news
 
 
 .PHONY: blog
-blog: phd_site.py atom_10.py rss_20.py
+blog: phd.py phd_site.py atom_10.py rss_20.py
 	./reindex_blog_ru
 	$(MAKE) html
 
@@ -40,7 +40,7 @@ templates = $(shell find ../htdocs/phdru.name -type f -name \*.tmpl -print)
 htmls = $(patsubst %.tmpl,%.html,$(templates))
 
 .PHONY: html
-html: phd_site.py $(htmls) special-templates sitemap
+html: phd.py phd_site.py $(htmls) special-templates sitemap
 
 
 .PHONY: news
@@ -53,15 +53,27 @@ SITEMAP = ../htdocs/phdru.name/sitemap.xml
 .PHONY: sitemap
 sitemap: $(SITEMAP)
 
-$(SITEMAP): $(allfiles)
+$(SITEMAP): $(allfiles) sitemaps/phdru.name-config.xml
 	sitemap_gen.py --config=sitemaps/phdru.name-config.xml
 
 
 .PHONY: special-templates
-special-templates: ../htdocs/phdru.name/Russian/Software/instant-messengers/instant-messengers-lj.html
+special-templates: ../htdocs/phdru.name/Russian/Software/instant-messengers/instant-messengers-lj.html ../htdocs/phdru.name/Russian/remote-work-bio/remote-work-bio-lj.html ../htdocs/phdru.name/Russian/remote-work-bio/remote-work-bio2-lj.html
 
 ../htdocs/phdru.name/Russian/Software/instant-messengers/instant-messengers-lj.html: ../htdocs/phdru.name/Russian/Software/instant-messengers/instant-messengers.html
 	{ sed -e '1,/alink="#ff0000">/d' \
 	   -e 's/<div class="section" id="icq">/<lj-cut text="IM">&/' \
 	   -e '/<hr width="90%">/,$$d' $< | sed '1,2d'; \
 	  echo '</lj-cut>'; } >$@
+
+../htdocs/phdru.name/Russian/remote-work-bio/remote-work-bio-lj.html: ../htdocs/phdru.name/Russian/remote-work-bio/remote-work-bio.html
+	{ sed -e '1,/alink="#ff0000">/d' \
+	   -e 's/<div class="section" id="i">/<lj-cut text="á×ÔÏâÉÏ...">&/' \
+	   -e '/<hr width="90%">/,$$d' $< | sed '1,2d'; \
+	  echo '</lj-cut>'; } >$@
+
+../htdocs/phdru.name/Russian/remote-work-bio/remote-work-bio2-lj.html: ../htdocs/phdru.name/Russian/remote-work-bio/remote-work-bio2.html
+	{ sed -e '1,/alink="#ff0000">/d' \
+	   -e 's/<div class="section" id="ii">/<lj-cut text="îÉËÔÏ ÎÅ ÏÂÅÝÁÌ ÒÁÊÓËÏÇÏ ÓÁÄÁ...">&/' \
+	   -e '/<hr width="90%">/,$$d' $< | sed '1,2d'; \
+	  echo '</lj-cut>'; } >$@