From a9e00b4195bf4d38ed0727d1f639ab301720f6f6 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sun, 26 Apr 2026 15:40:18 +1200 Subject: [PATCH 1/4] Fix missing RELEASENOTES.html The linuxdoc tool used to generate release notes is not optional. --- Makefile.am | 6 ++++++ configure.ac | 3 +-- doc/release-notes/Makefile.am | 28 ++++++++-------------------- 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9d4403253e9..c4e8f8a5359 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,6 +40,11 @@ dist-hook: fi; \ done +RELEASENOTES.html: html + cp -p $(builddir)/doc/release-notes/release-$(SQUID_RELEASE).html $@ + +CLEANFILES = RELEASENOTES.html + EXTRA_DIST = \ ChangeLog \ CONTRIBUTORS \ @@ -48,6 +53,7 @@ EXTRA_DIST = \ INSTALL \ QUICKSTART \ README \ + RELEASENOTES.html \ SPONSORS \ bootstrap.sh \ po4a.conf diff --git a/configure.ac b/configure.ac index 90c036e0df8..b4fa375a5dc 100644 --- a/configure.ac +++ b/configure.ac @@ -151,8 +151,7 @@ AC_PATH_PROG(AR, ar, $FALSE) AR_R="$AR r" AC_SUBST(AR_R) -AC_PATH_PROG(LINUXDOC, linuxdoc, $FALSE) -AM_CONDITIONAL(ENABLE_RELEASE_DOCS, test "x${ac_cv_path_LINUXDOC}" != "x$FALSE") +AC_PATH_PROG(LINUXDOC, linuxdoc, [:]) SQUID_RELEASE=`echo $VERSION | cut -d. -f1` AC_SUBST(SQUID_RELEASE) diff --git a/doc/release-notes/Makefile.am b/doc/release-notes/Makefile.am index f41919db009..43b8ff0aa07 100644 --- a/doc/release-notes/Makefile.am +++ b/doc/release-notes/Makefile.am @@ -5,10 +5,9 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -# requires the linuxdoc tools -if ENABLE_RELEASE_DOCS +html: release-$(SQUID_RELEASE).html -DOC= release-$(SQUID_RELEASE) +EXTRA_DIST = release-$(SQUID_RELEASE).sgml.in SUFFIXES= .sgml.in .sgml @@ -21,30 +20,19 @@ SUFFIXES= .sgml.in .sgml test `grep -c "@SQUID" $@` -eq 0 .sgml.txt: - linuxdoc -B txt --filter $< + $(LINUXDOC) -B txt --filter $< .sgml.html: - linuxdoc -B html -T 2 --split=0 $< + $(LINUXDOC) -B html -T 2 --split=0 $< && \ perl -i -p -e "s%$@%%" $@ - cp -p $@ $(top_builddir)/RELEASENOTES.html .sgml.man: - linuxdoc -B txt --manpage $< + $(LINUXDOC) -B txt --manpage $< .sgml.info: - linuxdoc -B info $< - -dist-hook: $(DOC).html - @if test -f $(builddir)/$(DOC).html; then \ - cp -p $(builddir)/$(DOC).html $(top_distdir)/RELEASENOTES.html; \ - fi - -EXTRA_DIST= $(DOC).html + $(LINUXDOC) -B info $< CLEANFILES= \ - *.html \ + *.html *.sgml \ *.tex *.ps *.dvi *.aux *.log *.toc \ - *.txt *.man \ - $(top_builddir)/RELEASENOTES.html - -endif + *.txt *.man From 8344a770bf5ae2e8cb1b4392da6ed174aca33a8b Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Sun, 26 Apr 2026 19:49:34 +1200 Subject: [PATCH 2/4] Polish doc/release-notes/Makefile.am --- doc/release-notes/Makefile.am | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/doc/release-notes/Makefile.am b/doc/release-notes/Makefile.am index 43b8ff0aa07..f4bdb82b681 100644 --- a/doc/release-notes/Makefile.am +++ b/doc/release-notes/Makefile.am @@ -5,18 +5,16 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -html: release-$(SQUID_RELEASE).html +DOC = release-$(SQUID_RELEASE) -EXTRA_DIST = release-$(SQUID_RELEASE).sgml.in - -SUFFIXES= .sgml.in .sgml +SUFFIXES = .sgml.in .sgml .sgml.in.sgml: - sed \ - -e "s%[@]SQUID_VERSION[@]%$(VERSION)%g" \ - -e "s%[@]SQUID_RELEASE[@]%$(SQUID_RELEASE)%g" \ - -e "s%[@]SQUID_RELEASE_OLD[@]%$$(( $(SQUID_RELEASE) - 1 ))%g" \ - < $< >$@ + $(SED) \ + -e "s%[@]SQUID_VERSION[@]%$(VERSION)%g" \ + -e "s%[@]SQUID_RELEASE[@]%$(SQUID_RELEASE)%g" \ + -e "s%[@]SQUID_RELEASE_OLD[@]%$$(( $(SQUID_RELEASE) - 1 ))%g" \ + < $< >$@ test `grep -c "@SQUID" $@` -eq 0 .sgml.txt: @@ -24,7 +22,7 @@ SUFFIXES= .sgml.in .sgml .sgml.html: $(LINUXDOC) -B html -T 2 --split=0 $< && \ - perl -i -p -e "s%$@%%" $@ + $(PERL) -i -p -e "s%$@%%" $@ .sgml.man: $(LINUXDOC) -B txt --manpage $< @@ -32,7 +30,11 @@ SUFFIXES= .sgml.in .sgml .sgml.info: $(LINUXDOC) -B info $< -CLEANFILES= \ +html: $(DOC).html + +EXTRA_DIST = $(DOC).sgml.in + +CLEANFILES = \ *.html *.sgml \ *.tex *.ps *.dvi *.aux *.log *.toc \ *.txt *.man From 3ac4fc8f9ebe3bb6705e1cb6e5ef7d0e7edb8483 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Fri, 1 May 2026 17:10:16 +1200 Subject: [PATCH 3/4] Reviewer requested change Complain about the command, not about the inability to generate the output. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b4fa375a5dc..5f9554feaec 100644 --- a/configure.ac +++ b/configure.ac @@ -151,7 +151,7 @@ AC_PATH_PROG(AR, ar, $FALSE) AR_R="$AR r" AC_SUBST(AR_R) -AC_PATH_PROG(LINUXDOC, linuxdoc, [:]) +AC_PATH_PROG(LINUXDOC, linuxdoc, /usr/bin/linuxdoc) SQUID_RELEASE=`echo $VERSION | cut -d. -f1` AC_SUBST(SQUID_RELEASE) From 1f7999f697f7a1e8f4a2bed8773f2987d3b104f3 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Fri, 1 May 2026 19:27:32 +1200 Subject: [PATCH 4/4] Reviewer request --- Makefile.am | 2 +- doc/release-notes/release-7.sgml.in | 2 +- doc/release-notes/release-8.sgml.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index c4e8f8a5359..68df476f230 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,7 +43,7 @@ dist-hook: RELEASENOTES.html: html cp -p $(builddir)/doc/release-notes/release-$(SQUID_RELEASE).html $@ -CLEANFILES = RELEASENOTES.html +DISTCLEANFILES += RELEASENOTES.html EXTRA_DIST = \ ChangeLog \ diff --git a/doc/release-notes/release-7.sgml.in b/doc/release-notes/release-7.sgml.in index c4fc4b46047..bd42afb8987 100644 --- a/doc/release-notes/release-7.sgml.in +++ b/doc/release-notes/release-7.sgml.in @@ -6,7 +6,7 @@ Notice -

The Squid Team are pleased to announce the release of Squid-@PACKAGE_VERSION@ for testing. +

The Squid Team are pleased to announce the release of Squid-@SQUID_VERSION@ for testing. This new release is available for download from or the . diff --git a/doc/release-notes/release-8.sgml.in b/doc/release-notes/release-8.sgml.in index 6866949385d..121c5879028 100644 --- a/doc/release-notes/release-8.sgml.in +++ b/doc/release-notes/release-8.sgml.in @@ -6,7 +6,7 @@ Notice -

The Squid Team are pleased to announce the release of Squid-@PACKAGE_VERSION@ for testing. +

The Squid Team are pleased to announce the release of Squid-@SQUID_VERSION@ for testing. This new release is available for download from or the .