Fix(phd.py): Change URL for Lurk

[phdru.name/phdru.name.git] / Makefile

diff --git a/Makefile b/Makefile
index aecb84e309502f3eb80c9bffe8f287f9dc32e5ff..506436311a8e6ee7bc6640afbc953358f6a0bd3d 100644 (file)
--- 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_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
@@ -53,12 +53,12 @@ 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 ../htdocs/phdru.name/Russian/remote-work-bio/remote-work-bio-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' \
@@ -71,3 +71,9 @@ special-templates: ../htdocs/phdru.name/Russian/Software/instant-messengers/inst
           -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>'; } >$@