]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix building of VC package manuals with relative includes
authorJoseph Turner <joseph@breatheoutbreathe.in>
Sat, 6 May 2023 21:49:43 +0000 (14:49 -0700)
committerPhilip Kaludercic <philipk@posteo.net>
Sat, 13 May 2023 17:16:57 +0000 (19:16 +0200)
* 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)

lisp/emacs-lisp/package-vc.el

index 85193dd7a30ec53e31bb37a725f55216068778b6..1fcc30595da2fc9cf7a430075c139704b356a3c2 100644 (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."
   (let* ((pkg-name (package-desc-name 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)))
          clean-up)
     (when (string-match-p "\\.org\\'" file)
@@ -361,7 +362,9 @@ otherwise it's assumed to be an Info file."
       (erase-buffer)
       (cond
        ((/= 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"
                  file (buffer-name)))
        ((/= 0 (call-process "install-info" nil t nil