Changed the number and the order of parameters.

git-svn-id: file:///home/phd/archive/SVN/phdru.name/scripts@29 7bb0bf08-9e0d-0410-b083-99cee3bf18b8

diff --git a/Makefile b/Makefile
index 3e4ba3710dddbbfa36b19583f2965126d68902dc..835200a66821d634a5cf337e0a625ed7d7d0423a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,10 +26,10 @@ phd_pp_ru.py: phd_pp_ru.tmpl
 news: ../htdocs/phd.pp.ru/news.tmpl ../htdocs/phd.pp.ru/Russian/news.tmpl
 
 ../htdocs/phd.pp.ru/news.tmpl: news_en
-       @(umask 022; PYTHONPATH=.; export PYTHONPATH; ./make-news.py en '' ../htdocs/phd.pp.ru/news.tmpl)
+       @(umask 022; PYTHONPATH=.; export PYTHONPATH; ./make-news.py en ../htdocs/phd.pp.ru)
 
 ../htdocs/phd.pp.ru/Russian/news.tmpl: news_ru
-       @(umask 022; PYTHONPATH=.; export PYTHONPATH; ./make-news.py ru Russian ../htdocs/phd.pp.ru/Russian/news.tmpl)
+       @(umask 022; PYTHONPATH=.; export PYTHONPATH; ./make-news.py ru ../htdocs/phd.pp.ru/Russian)
 
 
 .PHONY: blog

diff --git a/make-news.py b/make-news.py
index 9556322aff54fac2592599ae3bd090b03255899f..a1169edfbe537fe60dacfef92080c98fbc1904ff 100755 (executable)
--- a/make-news.py
+++ b/make-news.py
@@ -11,7 +11,6 @@ import sys, os
 from news import get_news, write_if_changed
 
 header, news_items = get_news(sys.argv[1])
-root_dir = sys.argv[2]
 
 new_text = [header]
 
@@ -30,4 +29,4 @@ new_text.append("""\
 $phd_pp_ru.respond(self)
 """)
 
-write_if_changed(sys.argv[3], ''.join(new_text))
+write_if_changed(os.path.join(sys.argv[2], "news.tmpl"), ''.join(new_text))