Merge branch 'master' into performance-tests

Author: marc-casavant

.github/workflows/ci-rpm.yml

@@ -205,7 +205,7 @@ jobs:
         dnf install -y procps-ng
 
     - name: Load RPMs
-      uses: actions/download-artifact@v6
+      uses: actions/download-artifact@v8
       with:
         name: rpms-${{ matrix.env.NAME }}
 

Makefile

@@ -404,7 +404,7 @@ compile_commands.json:
 #
 .PHONY: certs
 certs:
-	@$(MAKE) -C raddb/certs
+	@$(MAKE) -C raddb/certs Q=@
 
 ######################################################################
 #

README.md

@@ -8,28 +8,6 @@
 #
 WITH_DOC := $(strip $(foreach x,doc man doxygen,$(findstring $(x),$(MAKECMDGOALS))))
 
-#
-#  Convert adoc to man, and then let "install.man" deal with things.
-#  This means a bare "make install.man" after "configure" won't get the
-#  right things, but oh well.
-#
-ADOC2MAN_FILES := $(filter-out %/index.adoc,$(wildcard doc/antora/modules/reference/pages/man/*.adoc))
-$(BUILD_DIR)/make/man.mk: $(ADOC2MAN_FILES) | $(BUILD_DIR)/make
-	@rm -f $@
-	${Q}for x in $^; do \
-		y=$$(grep :manvolnum: $$x | awk '{print $$2}'); \
-		z=$$(basename $$x | sed 's/.adoc//'); \
-		echo "AUTO_MAN_FILES += man/man$$y/$$z.$$y" >> $@; \
-		echo "man/man$$y/$$z.$$y: $$x" >> $@; \
-		printf "\t"'@echo AUTO-MAN $$(notdir $$@)'"\n" >> $@; \
-		printf "\t"'@mkdir -p $$(dir $$@)'"\n" >> $@; \
-		printf "\t"'@asciidoctor -b manpage $$< -o $$@'"\n" >> $@; \
-		echo "" >> $@; \
-	done
-
--include $(BUILD_DIR)/make/man.mk
-ALL_INSTALL += $(AUTO_MAN_FILES)
-
 #
 #  Skip documentation if any of the necessary prerequisites are missing.
 #
@@ -57,6 +35,28 @@ endif
 #  If we still decide to build the documentation, then add in all of the documentation rules.
 #
 ifneq "$(WITH_DOC)" ""
+#
+#  Convert adoc to man, and then let "install.man" deal with things.
+#  This means a bare "make install.man" after "configure" won't get the
+#  right things, but oh well.
+#
+ADOC2MAN_FILES := $(filter-out %/index.adoc,$(wildcard doc/antora/modules/reference/pages/man/*.adoc))
+$(BUILD_DIR)/make/man.mk: $(ADOC2MAN_FILES) | $(BUILD_DIR)/make
+	@rm -f $@
+	${Q}for x in $^; do \
+		y=$$(grep :manvolnum: $$x | awk '{print $$2}'); \
+		z=$$(basename $$x | sed 's/.adoc//'); \
+		echo "AUTO_MAN_FILES += man/man$$y/$$z.$$y" >> $@; \
+		echo "man/man$$y/$$z.$$y: $$x" >> $@; \
+		printf "\t"'@echo AUTO-MAN $$(notdir $$@)'"\n" >> $@; \
+		printf "\t"'@mkdir -p $$(dir $$@)'"\n" >> $@; \
+		printf "\t"'@asciidoctor -b manpage $$< -o $$@'"\n" >> $@; \
+		echo "" >> $@; \
+	done
+
+-include $(BUILD_DIR)/make/man.mk
+ALL_INSTALL += $(AUTO_MAN_FILES)
+
 all.doc: docsite
 
 install: install.doc
@@ -282,6 +282,10 @@ doc.fixascii:
 	@perl -p -i -e "s,‘,',g;s,’,',g;s,–,-,g;s,—,-,g;s, , ,g;s:…:,:g;s,“,\",g;s,”,\",g;s,≤,<=,g;s,≥,>=,g;s,→,->,g" $$(find doc/antora -name "*.adoc" -print)
 
 
+.PHONY: doc.copyright
+doc.copyright:
+	perl -p -i -e "s/Copyright \(C\) 2.../Copyright (C) $$(date +%Y)/"  $$(git grep -l 'Copyright' $$(find doc/antora/ -name "*.adoc" -print))
+
 doc: build/docsite/sitemap.xml
 
 # end of WITH_DOC