Release target including pre-building HTML man pages

diff --git a/Makefile b/Makefile
index a949a80b4c039cb53cab67161cc869e9e02e391e..0b72ca49908dcf313b337661068256c0f95aa68a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+VERSION=0.9
+YEAR=2017
+
 # The default target
 all: runtree programs configs
 
@@ -48,4 +51,21 @@ $(o)/%.8: $(s)/%.8.txt
        $(Q)a2x -f manpage $@.txt
        $(Q)$(call symlink,$@,run/share/man/man8)
 
+# The dependency on %.1 is there to serialize both calls of asciidoc,
+# which does not name temporary files safely.
+$(o)/%.1.html: $(s)/%.1.txt $(o)/%.1
+       $(M)HTML $<
+       $(Q)a2x -f xhtml -D $(@D) $<
+$(o)/%.8.html: $(s)/%.8.txt $(o)/%.8
+       $(M)HTML $<
+       $(Q)a2x -f xhtml -D $(@D) $<
+
+release: $(HTML_DOCS)
+       git tag v$(VERSION)
+       git push --tags
+       git archive --format=tar --prefix=subauth-$(VERSION)/ HEAD | gzip >subauth-$(VERSION).tar.gz
+       rsync subauth-$(VERSION).tar.gz atrey:ftp/linux/
+       rsync $(HTML_DOCS) jw:www/static/sw/subauth/
+       ssh jw 'cd web && bin/release-prog subauth $(VERSION)'
+
 endif

diff --git a/client/Makefile b/client/Makefile
index 77e36128ff6ccda1ffe3bbcbb699fb1e045e0e50..679b938ad4b11f0fd02498e7fc1f5d48dc7a050f 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,6 +1,7 @@
 DIRS+=client
 
 PROGS+=$(o)/client/subauth $(o)/client/subauth.1
+HTML_DOCS+=$(o)/client/subauth.1.html
 
 $(o)/client/subauth: $(o)/client/subauth.o
 

diff --git a/server/Makefile b/server/Makefile
index 73855254fb7244f26c2d8fda88aaaf0afd546d04..03a29240ddb294a73b18eb5d21bbd30bcb613010 100644 (file)
--- a/server/Makefile
+++ b/server/Makefile
@@ -2,6 +2,7 @@ DIRS+=server
 
 PROGS+=$(o)/server/subauthd $(o)/server/subauthd.8
 CONFIGS+=subauthd
+HTML_DOCS+=$(o)/server/subauthd.8.html
 
 $(o)/server/subauthd: $(addprefix $(o)/server/, subauthd.o cmd.o auth.o temp.o)
 $(o)/server/subauthd: LIBS+=$(LIBGCRYPT_LIBS)