diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2023-03-21 18:08:15 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-05 14:18:53 -0700 |
| commit | 092df21dfca2b53e459947931245cb0e06d35ca8 (patch) | |
| tree | 0dced490f54702e2b29b20b0c70438c24c74a408 /Documentation/Makefile | |
| parent | ae73b2c8f1da39c39335ee76a0f95857712c22a7 (diff) | |
| download | git-092df21dfca2b53e459947931245cb0e06d35ca8.tar.gz | |
doc: remove manpage-base-url workaround
Commit 50d9bbba92 (Documentation: Avoid use of xmlto --stringparam,
2009-12-04) introduced manpage-base-url.xsl because ancient versions of
xmlto did not have --stringparam.
However, that was more than ten years ago, no need for that complexity
anymore, we can just use --stringparam.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Acked-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/Makefile')
| -rw-r--r-- | Documentation/Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index a6ba5bd460..5cd35df61c 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -189,7 +189,7 @@ endif ifndef MAN_BASE_URL MAN_BASE_URL = file://$(htmldir)/ endif -XMLTO_EXTRA += -m manpage-base-url.xsl +XMLTO_EXTRA += --stringparam man.base.url.for.relative.links='$(MAN_BASE_URL)' ifdef USE_ASCIIDOCTOR ASCIIDOC = asciidoctor @@ -331,7 +331,6 @@ clean: $(RM) technical/*.html technical/api-index.txt $(RM) SubmittingPatches.txt $(RM) $(cmds_txt) $(mergetools_txt) *.made - $(RM) manpage-base-url.xsl $(RM) GIT-ASCIIDOCFLAGS $(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS) @@ -340,11 +339,7 @@ $(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS) $(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $< -manpage-base-url.xsl: manpage-base-url.xsl.in - $(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@ - - -manpage-prereqs := manpage-base-url.xsl $(wildcard manpage*.xsl) +manpage-prereqs := $(wildcard manpage*.xsl) manpage-cmd = $(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< %.1 : %.xml $(manpage-prereqs) |