procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix building of VC package manuals with relative includes

Browse source 
* lisp/emacs-lisp/package-vc.el (package-vc--build-documentation):
Invoke makeinfo with -I to ensure the package directory is always
consulted for @include statements.  (Bug#63337)
This commit is contained in:
Joseph Turner 2023-05-06 14:49:43 -07:00 • committed by Philip Kaludercic
parent 61659f36c8
commit 1e6a759436
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/emacs-lisp/package-vc.el
View file

@ -347,6 +347,7 @@ FILE can be an Org file, indicated by its \".org\" extension,
otherwise it's assumed to be an Info file." otherwise it's assumed to be an Info file."
(let* ((pkg-name (package-desc-name pkg-desc)) (let* ((pkg-name (package-desc-name pkg-desc))
(default-directory (package-desc-dir pkg-desc)) (default-directory (package-desc-dir pkg-desc))
(docs-directory (expand-file-name (file-name-directory file)))
(output (expand-file-name (format "%s.info" pkg-name))) (output (expand-file-name (format "%s.info" pkg-name)))
clean-up) clean-up)
(when (string-match-p "\\.org\\'" file) (when (string-match-p "\\.org\\'" file)
@ -361,7 +362,9 @@ otherwise it's assumed to be an Info file."
(erase-buffer) (erase-buffer)
(cond (cond
((/= 0 (call-process "makeinfo" nil t nil ((/= 0 (call-process "makeinfo" nil t nil
"--no-split" file "-o" output)) "-I" docs-directory
"--no-split" file
"-o" output))
(message "Failed to build manual %s, see buffer %S" (message "Failed to build manual %s, see buffer %S"
file (buffer-name))) file (buffer-name)))
((/= 0 (call-process "install-info" nil t nil ((/= 0 (call-process "install-info" nil t nil