This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch version-1.0.1
in repository guix.

The following commit(s) were added to refs/heads/version-1.0.1 by this push:
     new 58d7909  doc: Make sure 'htmlxref.cnf' is honored.
58d7909 is described below

commit 58d7909c97c1ab2457faee1d7af925ee32ad15c2
Author: Ludovic Courtès <[email protected]>
AuthorDate: Sun Jan 12 00:14:53 2020 +0100

    doc: Make sure 'htmlxref.cnf' is honored.
    
    Fixes <https://bugs.gnu.org/39060>.
    Reported by Tobias Geerinckx-Rice <[email protected]>.
    
    * doc/build.scm (html-manual)[build]: Copy 'htmlxref.cnf' to the current
    directory so that 'makeinfo' honors it.
---
 doc/build.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/build.scm b/doc/build.scm
index 6326736..a227a48 100644
--- a/doc/build.scm
+++ b/doc/build.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2019 Ludovic Courtès <[email protected]>
+;;; Copyright © 2019, 2020 Ludovic Courtès <[email protected]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -203,6 +203,11 @@ makeinfo OPTIONS."
           (setvbuf (current-output-port) 'line)
           (setvbuf (current-error-port) 'line)
 
+          ;; 'makeinfo' looks for "htmlxref.cnf" in the current directory, so
+          ;; copy it right here.
+          (copy-file (string-append #$manual-source "/htmlxref.cnf")
+                     "htmlxref.cnf")
+
           (for-each (lambda (language)
                       (let ((opts `("--html"
                                     "-c" ,(string-append 
"TOP_NODE_UP_URL=/manual/"

Reply via email to