On Mon, 2022-11-28 at 14:08 +0100, Ævar Arnfjörð Bjarmason wrote: > Whether we use eval/define or not (I just tried to avoid the > repetition) I think referring to $(DOC_MAN[157]) here probably makes > more sense if we're poking at these rules. > > I.e. in this case the rest of the Makefile is carrying forward what > manpages we're generating exactly, so rather than a wildcard %.1 to > %.xml we can narrow it down to just the %.1 files we're going to b > generating (but maybe that's best left for later...): I have no opinion on which is better :). I'm not sure what the above comment is asking for though: are you going to take over pushing this change? Or do you want me to reroll the commit with these changes instead? Or are we waiting for more opinions? > diff --git a/Documentation/Makefile b/Documentation/Makefile > index 5e1a7f655c2..7404cead084 100644 > --- a/Documentation/Makefile > +++ b/Documentation/Makefile > @@ -351,8 +351,12 @@ $(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS) > manpage-base-url.xsl: manpage-base-url.xsl.in > $(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@ > > -%.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcard manpage*.xsl) > - $(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< > +define doc-man-tmpl > +$$(DOC_MAN$(1)): %.$(1) : %.xml manpage-base-url.xsl $$(wildcard manpage*.xsl) > + $$(QUIET_XMLTO)$$(XMLTO) -m $$(MANPAGE_XSL) $$(XMLTO_EXTRA) man $$< > + > +endef > +$(eval $(foreach n,1 5 7,$(call doc-man-tmpl,$(n)))) > > %.xml : %.txt $(ASCIIDOC_DEPS) > $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@ $<
