From de12ed44bff5c0206cc6ce7ca902c9b9d1aacbcc Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Thu, 25 Sep 2025 22:50:47 +1200 Subject: [PATCH 1/2] Build documentation last Some documentation requires other sources and tools to already have built or generated their output. --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index c3392b52477..62647cb6ffc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,6 @@ AUTOMAKE_OPTIONS = dist-bzip2 1.5 foreign SUBDIRS = \ compat \ contrib \ - doc \ errors \ icons @@ -23,7 +22,8 @@ SUBDIRS += \ scripts \ src \ tools \ - test-suite + test-suite \ + doc DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]* DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` From 2c32836a2cc42c996747b487616e22601fbe7896 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Thu, 25 Sep 2025 23:42:02 +1200 Subject: [PATCH 2/2] Build configuration manual Use automake to build the cfgman documentation. This was done as part of the daily snapshot release which is no longer happening. --- doc/Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/Makefile.am b/doc/Makefile.am index c95c7eb6a45..6b15157b605 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -14,3 +14,8 @@ DEFAULT_ERROR_DIR = $(datadir)/errors EXTRA_DIST = \ debug-messages.dox \ debug-sections.txt + +cfgman: $(top_builddir)/src/cf.data $(top_srcdir)/scripts/www/build-cfg-help.pl + @mkdir -p cfgman + $(top_srcdir)/scripts/www/build-cfg-help.pl --version $(VERSION) -o cfgman $(top_builddir)/src/cf.data + $(top_srcdir)/scripts/www/build-cfg-help.pl --version $(VERSION) -o squid-$(VERSION)-cfgman.html -f singlehtml $(top_builddir)/src/cf.data