X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=doc%2FMakefile;h=d3c88b3774961d7824bec361ffcece7945e40926;hb=edcb80f25875200a73269045db71c1579b0c2c82;hp=29d3c428ed895322c6ffa961b48823ef29b00a95;hpb=5b782c8f45ed6c34ed0e7f1aff6ac298c9a879ff;p=fw%2Faltos

diff --git a/doc/Makefile b/doc/Makefile
index 29d3c428..d3c88b37 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -167,21 +167,37 @@ ONEFILE_PDF_FILES=$(ONEFILE_TXT_FILES:.txt=.pdf)
 
 HTML=altusmetrum.html micropeak.html telegps.html $(RELNOTES_HTML) $(ONEFILE_HTML_FILES)
 
+HTML_REVHISTORY=\
+	altusmetrum-revhistory.html \
+	micropeak-revhistory.html \
+	telegps-revhistory.html
+
 PDF=altusmetrum.pdf micropeak.pdf telegps.pdf $(RELNOTES_PDF) $(ONEFILE_PDF_FILES) \
 	$(OUTLINE_PDF_FILES)
 
 FOP_STYLE=am-fo.xsl
+HTML_STYLE=am-html.xsl
 FOP_XCONF=fop.xconf
 STYLESHEET=am.css
 
+FONTS=\
+	fonts/DejaVuSansMono-BoldOblique.ttf \
+	fonts/DejaVuSansMono-Bold.ttf \
+	fonts/DejaVuSansMono-Oblique.ttf \
+	fonts/DejaVuSansMono.ttf \
+	fonts/OpenSans-Light.ttf \
+	fonts/OpenSans-LightItalic.ttf \
+	fonts/OpenSans-Semibold.ttf \
+	fonts/OpenSans-SemiboldItalic.ttf
+
 TEMPLATES_TMPL=titlepage.templates.tmpl
 
 TEMPLATES_XSL=$(TEMPLATES_TMPL:.tmpl=.xsl)
 
 PDF_CONFIG_FILES=$(FOP_STYLE) $(FOP_XCONF) $(TEMPLATES_XSL)
-HTML_CONFIG_FILES=$(TEMPLATES_XSL) $(STYLESHEET)
+HTML_CONFIG_FILES=$(TEMPLATES_XSL)
 
-DOC=$(HTML) $(PDF) $(IMAGES) $(STYLESHEET)
+DOC=$(HTML) $(HTML_REVHISTORY) $(PDF) $(IMAGES) $(STYLESHEET)
 
 .SUFFIXES: .tmpl .xsl .inc .txt .raw .pdf .html
 
@@ -195,7 +211,7 @@ DOC=$(HTML) $(PDF) $(IMAGES) $(STYLESHEET)
 	a2x -a docinfo -f pdf --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(FOP_STYLE) --fop --fop-opts="-c $(FOP_XCONF)" $*.raw
 
 .raw.html:
-	a2x -a docinfo -f xhtml --xsltproc-opts "--stringparam toc.section.depth 2" --stylesheet=$(STYLESHEET) $*.raw
+	a2x -a docinfo -f xhtml --xsltproc-opts "--stringparam toc.section.depth 2" --xsl-file $(HTML_STYLE) --stylesheet=$(STYLESHEET) $*.raw
 
 .tmpl.xsl:
 	xsltproc --output $@ /usr/share/xml/docbook/stylesheet/docbook-xsl/template/titlepage.xsl $*.tmpl
@@ -204,6 +220,12 @@ all:	$(HTML) $(PDF)
 
 $(HTML): $(PDF)
 
+altusmetrum-revhistory.html: altusmetrum.html
+
+micropeak-revhistory.html: micropeak.html
+
+telegps-revhistory.html: telegps.html
+
 altusmetrum.pdf altusmetrum.html: altusmetrum-docinfo.xml $(RAW_FILES) $(RAW_INC) $(IMAGES)
 
 telegps.html telegps.pdf: telegps-docinfo.xml $(TELEGPS_RAW_FILES) $(IMAGES)
@@ -212,19 +234,23 @@ micropeak.pdf micropeak.html: micropeak-docinfo.xml $(MICROPEAK_RAW_FILES) $(IMA
 
 install:	all
 
-publish:	$(DOC)
+publish:	$(DOC) $(FONTS)
 	cp $(DOC) /home/bdale/web/altusmetrum/AltOS/doc/
+	mkdir -p /home/bdale/web/altusmetrum/AltOS/doc/fonts/
+	cp $(FONTS) /home/bdale/web/altusmetrum/AltOS/doc/fonts/
 	(cd /home/bdale/web/altusmetrum ; \
 	 git add /home/bdale/web/altusmetrum/AltOS/doc/* ; \
+	 git add /home/bdale/web/altusmetrum/AltOS/doc/fonts/* ; \
 	 echo "update docs" | \
-	 git commit -F - /home/bdale/web/altusmetrum/AltOS/doc/* ; \
+	 git commit -F - /home/bdale/web/altusmetrum/AltOS/doc/* /home/bdale/web/altusmetrum/AltOS/doc/fonts/* ; \
 	 git push)
 
-publish-keithp:	$(DOC)
+publish-keithp:	$(DOC) $(FONTS)
 	scp -p $(DOC) keithp.com:~keithp/public_html/altos
+	scp -p $(FONTS) keithp.com:~keithp/public_html/altos/fonts
 
 clean:
-	rm -f $(HTML) $(PDF) $(TEMPLATES_XSL) $(RAW_FILES) $(TELEGPS_RAW_FILES) $(MICROPEAK_RAW_FILES)
+	rm -f $(HTML) $(HTML_REVHISTORY) $(PDF) $(TEMPLATES_XSL) $(RAW_FILES) $(TELEGPS_RAW_FILES) $(MICROPEAK_RAW_FILES)
 
 distclean: clean
 	rm -f $(HTML) $(PDF)