more CI updates

.github/workflows/CI.yaml

@@ -25,7 +25,7 @@ jobs:
             ENABLE_DRAFTS: ON
           - os: ubuntu-latest
             BUILD_TYPE: default
-            PACKAGES: asciidoc xmlto
+            PACKAGES: asciidoctor
             DRAFT: disabled
             POLLER: select
           - os: ubuntu-latest

configure.ac

@@ -76,7 +76,6 @@ PKG_PROG_PKG_CONFIG
 m4_pattern_forbid([^PKG_[A-Z_]+$], [missing some pkg-config macros (pkg-config package)])
 
 # Libtool configuration for different targets. See acinclude.m4
-AC_CHECK_TOOL([ASCIIDOCTOR], [asciidoctor])
 LIBZMQ_CONFIG_LIBTOOL
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL

doc/Makefile.am

@@ -28,42 +28,53 @@ MAN7 = \
     zmq_null.7 zmq_plain.7 zmq_curve.7 zmq_tipc.7 zmq_vmci.7 zmq_udp.7 \
     zmq_gssapi.7
 
-MAN_DOC =
+# MAN_ADOC contains all original Asciidoc files from git repo
+MAN_ADOC = $(MAN3:%.3=%.adoc) $(MAN7:%.7=%.adoc)
 
-MAN_ADOC = $(MAN3:%.3=%.adoc)
-MAN_ADOC += $(MAN7:%.7=%.adoc)
-MAN_HTML =
+# MAN_DOC contains all the MANUAL PAGES (generated from asciidoc files)
+MAN_DOC = $(MAN3) $(MAN7) 
 
-MAINTAINERCLEANFILES =
+# MAN_HTML contains all the HTML PAGES (generated from asciidoc files)
+MAN_HTML = $(MAN_ADOC:%.adoc=%.html)
 
+MAINTAINERCLEANFILES =
 EXTRA_DIST = $(MAN_ADOC)
 
-if INSTALL_MAN
-MAN_DOC += $(MAN3) $(MAN7)
-dist_man_MANS = $(MAN_DOC)
-MAINTAINERCLEANFILES += $(MAN_DOC)
-endif
 
+#
+# BUILD_DOC is set when Asciidoctor has been found
+# Declare here all the rules to produce documentation from .adoc files
+#
 if BUILD_DOC
-MAN_HTML += $(MAN_ADOC:%.adoc=%.html)
-MAN_DOC += $(MAN_HTML)
-EXTRA_DIST += $(MAN_HTML)
-MAINTAINERCLEANFILES += $(MAN_HTML)
 
-SUFFIXES=.html .adoc .xml .3 .7
+EXTRA_DIST += $(MAN_HTML) $(MAN_DOC)
+MAINTAINERCLEANFILES += $(MAN_HTML) $(MAN_DOC)
+SUFFIXES=.html .adoc .3 .7
 
 .adoc.html: 
 	asciidoctor -b html -azmq_version=@PACKAGE_VERSION@  $<
 .adoc.3:
 	asciidoctor -b manpage -azmq_version=@PACKAGE_VERSION@  $<
 .adoc.7:
 	asciidoctor -b manpage -azmq_version=@PACKAGE_VERSION@  $<
-endif
 
 dist-hook : $(MAN_DOC) $(MAN_HTML)
 
+# To help publishing HTML files into github Pages, we indicate github that the "zmq.html" page is the index page;
+# that page contains a link to all other documentation pages
 all-local :
 	ln -sf zmq.html index.html
 
 clean-local :
 	rm -f $(MAN3) $(MAN7) $(MAN_HTML)
+
+endif
+
+
+
+#
+# INSTALL_MAN is set when BUILD_DOC was set and additionally the manpages need to be installed
+#
+if INSTALL_MAN
+dist_man_MANS = $(MAN_DOC)
+endif