X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=doc%2FMakefile.am;h=4dfb309431a11e92c396ddb4cb44201b7c7b3afe;hb=f14c799ae7ff3be56c28f5694f04c03daff7708e;hp=b5839beaee98474be055578df88356a9c799297a;hpb=6d80b89c0bd82133dd5c93df8604f562ac49c19a;p=fw%2Faltos

diff --git a/doc/Makefile.am b/doc/Makefile.am
index b5839bea..4dfb3094 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -17,6 +17,7 @@ FAKETIME=TZ=UTC faketime -f '$(RELEASE_DATE) 00:00:00 i0'
 endif
 
 RELNOTES_INC=\
+	release-notes-1.9.inc \
 	release-notes-1.8.7.inc \
 	release-notes-1.8.6.inc \
 	release-notes-1.8.5.inc \
@@ -224,8 +225,10 @@ PUBLISH_HTML=altusmetrum.html micropeak.html telegps.html easymini.html $(ONEFIL
 
 HTML=$(PUBLISH_HTML) $(RELNOTES_HTML)
 
+if ASCIIDOCTOR_PDF
 PDF=altusmetrum.pdf micropeak.pdf telegps.pdf easymini.pdf $(ONEFILE_PDF_FILES) \
 	$(OUTLINE_PDF_FILES)
+endif
 
 MAP_DOT_FILES=map-loading.dot
 MAP_SVG_FILES=$(MAP_DOT_FILES:.dot=.svg)
@@ -243,6 +246,13 @@ FONTS=\
 	fonts/OpenSans-Semibold.ttf \
 	fonts/OpenSans-SemiboldItalic.ttf
 
+ICONS=\
+	images/icons/caution.svg \
+	images/icons/important.svg \
+	images/icons/note.svg \
+	images/icons/tip.svg \
+	images/icons/warning.svg
+
 PDF_CONFIG_FILES=altusmetrum-theme.yml
 HTML_CONFIG_FILES=
 
@@ -271,13 +281,13 @@ all:	$(HTML) $(PDF)
 
 map-loading.adoc: $(MAP_SVG_FILES)
 
-altusmetrum.pdf altusmetrum.html: altusmetrum-docinfo.xml $(ADOC_FILES) $(IMAGES)
+altusmetrum.pdf altusmetrum.html: $(ADOC_FILES) $(IMAGES)
 
-telegps.html telegps.pdf: telegps-docinfo.xml $(TELEGPS_ADOC_FILES) $(IMAGES)
+telegps.html telegps.pdf: $(TELEGPS_ADOC_FILES) $(IMAGES)
 
-micropeak.pdf micropeak.html: micropeak-docinfo.xml $(MICROPEAK_ADOC_FILES) $(IMAGES)
+micropeak.pdf micropeak.html: $(MICROPEAK_ADOC_FILES) $(IMAGES)
 
-easymini.pdf easymini.html: easymini-docinfo.xml $(EASYMINI_ADOC_FILES) $(IMAGES)
+easymini.pdf easymini.html: $(EASYMINI_ADOC_FILES) $(IMAGES)
 
 telemini-v1-outline.pdf: telemini-v1-outline.txt telemini-v1.svg
 
@@ -287,20 +297,25 @@ install:	all
 
 WEB_ROOT=/home/bdale/web/
 
-publish:	$(PUBLISH_DOC) $(FONTS)
-	cp $(PUBLISH_DOC) $(WEB_ROOT)/altusmetrum/AltOS/doc/
+publish:	$(PUBLISH_DOC) $(FONTS) $(ICONS)
+	cp -a $(PUBLISH_DOC) $(WEB_ROOT)/altusmetrum/AltOS/doc/
 	mkdir -p $(WEB_ROOT)/altusmetrum/AltOS/doc/fonts/
 	cp $(FONTS) $(WEB_ROOT)/altusmetrum/AltOS/doc/fonts/
+	mkdir -p $(WEB_ROOT)/altusmetrum/AltOS/doc/images/icons/
+	cp $(ICONS) $(WEB_ROOT)/altusmetrum/AltOS/doc/images/icons/
 	(cd $(WEB_ROOT)/altusmetrum ; \
 	 git add $(WEB_ROOT)/altusmetrum/AltOS/doc/* ; \
 	 git add $(WEB_ROOT)/altusmetrum/AltOS/doc/fonts/* ; \
+	 git add $(WEB_ROOT)/altusmetrum/AltOS/doc/images/icons/* ;\
 	 echo "update docs" | \
-	 git commit -F - $(WEB_ROOT)/altusmetrum/AltOS/doc/* $(WEB_ROOT)/altusmetrum/AltOS/doc/fonts/* ; \
+	 git commit -F - $(WEB_ROOT)/altusmetrum/AltOS/doc/* $(WEB_ROOT)/altusmetrum/AltOS/doc/fonts/* $(WEB_ROOT)/altusmetrum/AltOS/doc/images/icons ; \
 	 git push)
 
 publish-keithp:	am.html $(DOC) $(FONTS)
+	ssh keithp.com 'mkdir -p ~keithp/public_html/altos/fonts ~keithp/public_html/altos/images/icons'
 	scp -p am.html $(DOC) keithp.com:~keithp/public_html/altos
 	scp -p $(FONTS) keithp.com:~keithp/public_html/altos/fonts
+	scp -p $(ICONS) keithp.com:~keithp/public_html/altos/images/icons
 
 clean:
 	rm -f am.html $(HTML) $(PDF) $(ADOC_FILES) $(TELEGPS_ADOC_FILES) $(MICROPEAK_ADOC_FILES)