[bug#65479] [PATCH core-updates 52/61] gnu: git: Drop docbook workarounds.

[Bruno Victal]

* gnu/packages/version-control.scm (git)[arguments]<#:phases>: Drop
docbook-xsl related substitution.
[native-inputs]: Add docbook-xml-4.5.
---
 gnu/packages/version-control.scm | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 9342b68177..77f50458be 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -259,6 +259,7 @@ (define-public git
       ;; For subtree documentation.
       ("asciidoc" ,asciidoc)
       ("docbook2x" ,docbook2x)
+      ("docbook-xml" ,docbook-xml-4.5)
       ("docbook-xsl" ,docbook-xsl)
       ("libxslt" ,libxslt)
       ("pkg-config" ,pkg-config)
@@ -379,17 +380,6 @@ (define-public git
          (add-after 'build 'build-subtree
            (lambda* (#:key inputs #:allow-other-keys)
              (with-directory-excursion "contrib/subtree"
-               (substitute* "Makefile"
-                 ;; Apparently `xmlto' does not bother to looks up the 
stylesheets
-                 ;; specified in the XML, unlike the above substitution.  
Instead it
-                 ;; uses a hard-coded URL.  Work around it here, but if this is
-                 ;; common perhaps we should hardcode this path in xmlto 
itself.
-                 (("\\$\\(XMLTO\\) -m \\$\\(MANPAGE_XSL\\)")
-                  (string-append "$(XMLTO) -x "
-                                 (string-append (assoc-ref inputs 
"docbook-xsl")
-                                                "/xml/xsl/docbook-xsl-"
-                                                ,(package-version docbook-xsl))
-                                 "/manpages/docbook.xsl -m $(MANPAGE_XSL)")))
                (invoke "make")
                (invoke "make" "install")
                (invoke "make" "install-doc")
-- 
2.40.1