[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/12: doc: Make sure 'htmlxref.cnf' is honored.
From: |
guix-commits |
Subject: |
12/12: doc: Make sure 'htmlxref.cnf' is honored. |
Date: |
Sat, 11 Jan 2020 18:22:41 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit f9e0488c5002d3a102243583e408fa5f54b826eb
Author: Ludovic Courtès <address@hidden>
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 <address@hidden>.
* 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 e171b53..8d5b589 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 <address@hidden>
+;;; Copyright © 2019, 2020 Ludovic Courtès <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -410,6 +410,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* ((texi (language->texi-file-name language))
(opts `("--html"
- branch master updated (6b9839e -> f9e0488), guix-commits, 2020/01/11
- 02/12: gnu: Use the two-element 'define-deprecated' form where applicable., guix-commits, 2020/01/11
- 03/12: gnu: cmake@3.15.5: Apply "cmake-curl-certificates.patch"., guix-commits, 2020/01/11
- 05/12: daemon: Account for deleted store files when deduplication is on., guix-commits, 2020/01/11
- 08/12: gnu: entr: Fix references to external programs., guix-commits, 2020/01/11
- 12/12: doc: Make sure 'htmlxref.cnf' is honored.,
guix-commits <=
- 01/12: deprecation: Add a two-element form for simple aliases., guix-commits, 2020/01/11
- 07/12: system: Drop net-tools from %BASE-PACKAGES (replaced by iproute2)., guix-commits, 2020/01/11
- 06/12: daemon: Fix the displayed GC estimated progress., guix-commits, 2020/01/11
- 09/12: gnu: timidity++: Add libvorbis as input, guix-commits, 2020/01/11
- 11/12: doc: Update htmlxref.cnf., guix-commits, 2020/01/11
- 04/12: gnu: cmake@3.15.5: Honor 'SSL_CERT_DIR' and 'SSL_CERT_FILE'., guix-commits, 2020/01/11
- 10/12: gnu: Add libolm., guix-commits, 2020/01/11