undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doc: remove manpage-base-url workaround

Browse Source 
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>
This commit is contained in:
Felipe Contreras 2023-03-21 18:08:15 -06:00 committed by Junio C Hamano
parent ae73b2c8f1
commit 092df21dfc
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/.gitignore vendored
View File

@ -10,7 +10,6 @@ howto-index.txt
doc.dep doc.dep
cmds-*.txt cmds-*.txt
mergetools-*.txt mergetools-*.txt
manpage-base-url.xsl
SubmittingPatches.txt SubmittingPatches.txt
tmp-doc-diff/ tmp-doc-diff/
GIT-ASCIIDOCFLAGS GIT-ASCIIDOCFLAGS

9
Documentation/Makefile
View File

@ -189,7 +189,7 @@ endif
ifndef MAN_BASE_URL ifndef MAN_BASE_URL
MAN_BASE_URL = file://$(htmldir)/ MAN_BASE_URL = file://$(htmldir)/
endif endif
XMLTO_EXTRA += -m manpage-base-url.xsl XMLTO_EXTRA += --stringparam man.base.url.for.relative.links='$(MAN_BASE_URL)'
ifdef USE_ASCIIDOCTOR ifdef USE_ASCIIDOCTOR
ASCIIDOC = asciidoctor ASCIIDOC = asciidoctor
@ -331,7 +331,6 @@ clean:
$(RM) technical/*.html technical/api-index.txt $(RM) technical/*.html technical/api-index.txt
$(RM) SubmittingPatches.txt $(RM) SubmittingPatches.txt
$(RM) $(cmds_txt) $(mergetools_txt) *.made $(RM) $(cmds_txt) $(mergetools_txt) *.made
$(RM) manpage-base-url.xsl
$(RM) GIT-ASCIIDOCFLAGS $(RM) GIT-ASCIIDOCFLAGS
$(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS) $(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS)
@ -340,11 +339,7 @@ $(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS)
$(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS) $(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS)
$(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $< $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $<
manpage-base-url.xsl: manpage-base-url.xsl.in manpage-prereqs := $(wildcard manpage*.xsl)
$(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
manpage-prereqs := manpage-base-url.xsl $(wildcard manpage*.xsl)
manpage-cmd = $(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< manpage-cmd = $(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
%.1 : %.xml $(manpage-prereqs) %.1 : %.xml $(manpage-prereqs)

10
Documentation/manpage-base-url.xsl.in
View File

@ -1,10 +0,0 @@
<!-- manpage-base-url.xsl:
special settings for manpages rendered from newer docbook -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0">
<!-- set a base URL for relative links -->
<xsl:param name="man.base.url.for.relative.links"
>@@MAN_BASE_URL@@</xsl:param>
</xsl:stylesheet>