--- a/Makefile	Fri Jan 09 23:48:09 2015 +0100
+++ b/Makefile	Sat Jan 10 09:52:49 2015 +0100
@@ -2,10 +2,19 @@
 PDF = ${TXT:.txt=.pdf}
 HTML = ${TXT:.txt=.html}
 
-html exim.html:	${TXT}
-		asciidoc $<
+date = ${shell date -I}
+revision = "${shell hg id -tibB}"
+
+html out/exim.html:	${TXT}
+		@mkdir -p out
+		asciidoc -a date=${date} -a revision=${revision} -a x=y -o out/exim.html $<
 
-pdf exim.pdf:	${TXT}
-		a2x $<
+#pdf a2x/exim.pdf:	${TXT}
+#		mkdir -p a2x
+#		a2x --format=pdf --destination-dir=a2x/ $<
 
-clean:		; rm ${PDF} ${HTML}
+#epub a2x/exim.epub:	${TXT}
+#		mkdir -p a2x
+#		a2x --format=epub --destination-dir=a2x/ $<
+
+clean:		; rm -f out/*