X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=doc%2FMakefile;h=6e326ba519d833a22012d7e1ddb80eae59fc8a20;hb=d212d782bff977d609a9da1b805de4a2615fb474;hp=7c4da29ecf1c96df4ee5e87ad207e666b2271ff5;hpb=d029acad6a992be9b7b4498e70605f8a1e1a4ef6;p=fw%2Faltos

diff --git a/doc/Makefile b/doc/Makefile
index 7c4da29e..6e326ba5 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -10,29 +10,28 @@ RELNOTES=\
 	release-notes-1.0.1.html \
 	release-notes-1.1.html \
 	release-notes-1.1.1.html \
-	release-notes-1.2.html
+	release-notes-1.2.html \
+	release-notes-1.2.1.html \
+	release-notes-1.3.html
 
 RELNOTES_XSL=$(RELNOTES:.html=.xsl)
 HTML=altusmetrum.html altos.html telemetry.html companion.html micropeak.html $(RELNOTES)
 PDF=altusmetrum.pdf altos.pdf telemetry.pdf companion.pdf micropeak.pdf
 DOC=$(HTML) $(PDF)
 HTMLSTYLE=/usr/share/xml/docbook/stylesheet/docbook-xsl/html/docbook.xsl
-FOSTYLE=/usr/share/xml/docbook/stylesheet/docbook-xsl/fo/docbook.xsl
+FOSTYLE=./xorg-fo.xsl
 PDFSTYLE=
 IMAGES=telemetrum.svg telemini.svg
 
-.SUFFIXES: .xsl .html .fo .pdf
+.SUFFIXES: .xsl .html .pdf
 
 XSLTFLAGS=--stringparam section.autolabel 1 --xinclude
 
 .xsl.html:
 	xsltproc $(XSLTFLAGS) -o $@ $(HTMLSTYLE) $*.xsl
 
-.xsl.fo:
-	xsltproc $(XSLTFLAGS) -o $@ $(FOSTYLE) $*.xsl
-
-.fo.pdf:
-	fop -fo $*.fo -pdf $@
+.xsl.pdf:
+	xmlto -x $(FOSTYLE) --with-fop pdf $*.xsl
 
 all:	$(HTML) $(PDF)
 
@@ -47,10 +46,10 @@ publish:	$(DOC)
 	 git push)
 
 clean:
-	rm -f $(HTML) $(PDF) *.fo
+	rm -f $(HTML) $(PDF)
 
 distclean:
-	rm -f $(HTML) $(PDF) *.fo
+	rm -f $(HTML) $(PDF)
 
 altusmetrum.html: $(RELNOTES_XSL) $(IMAGES)
 altusmetrum.fo: $(RELNOTES_XSL) $(IMAGES)