2 files changed, 11 insertions, 12 deletions
diff --git a/www/Makefile b/www/Makefile
index d9405f6e..10eb66fc 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -18,25 +18,27 @@ HTML_MAIN = $(MD_MAIN:.md=.html)
 
 MD_NEWS != cat news/MANIFEST
 HTML_NEWS = $(MD_NEWS:.md=.html)
+HTML_BARE_NEWS = $(MD_NEWS:.md=.bare.html)
 
 
-# news/index.html implies the building of $(HTML_NEWS).
-all: $(HTML_MAIN) news/index.html
+# news/index.html implies the building of $(HTML_BARE_NEWS).
+all: $(HTML_MAIN) $(HTML_NEWS) news/index.html
 
-.SUFFIXES: .md .html
+.SUFFIXES: .md .html .bare.html
 .md.html:
 	./publish.sh $<
 
+.md.bare.html:
+	pandoc $(<) > $(<:.md=.bare.html)
+
 # Unlike all the other markdown files, news/index.md does not exist at first:
-# it must be generated by index.sh. Also note that index.sh depends on the
-# existence of the HTML version of all news items, hence the dependency line
-# below.
-news/index.md: $(HTML_NEWS)
+# it must be generated by index.sh. Also note that index.sh generates the RSS
+# feed, which requires the bare HTML versions of all news items.
+news/index.md: $(HTML_BARE_NEWS)
 	./index.sh
 
 clean:
-	rm -f	$(HTML_MAIN) $(HTML_MAIN:.html=.bare.html) \
-		$(HTML_NEWS) $(HTML_NEWS:.html=.bare.html) \
+	rm -f	$(HTML_MAIN) $(HTML_NEWS) $(HTML_BARE_NEWS) \
 		news/index.md news/index.html news/index.bare.html \
 		feed.xml news/feed.xml
 
diff --git a/www/publish.sh b/www/publish.sh
index f9d9f9a7..9a8a6abc 100755
--- a/www/publish.sh
+++ b/www/publish.sh
@@ -76,9 +76,6 @@ SMART=$(pandoc -v | grep -q '2\.0' || printf '%s\n' "--smart") || SMART=""
 pandoc $TOC $SMART "$TMPFILE" -s --css /global.css $OPTS \
         --template template.html --metadata return="$RETURN" > "$FILE.html"
 
-# additionally, produce bare file for RSS
-pandoc "$1" > "$FILE.bare.html"
-
 # generate section title anchors as [link]
 sed -i -e 's_^<h\([123]\) id="\(.*\)">\(.*\)</h\1>_<div class="h"><h\1 id="\2">\3</h\1><a aria-hidden="true" href="#\2">[link]</a></div>_' "$FILE.html"