branch master updated: gnu: emacs-ledger-mode: Fix autoload failure.

[guix-commits]

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

glv pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 2c50e52  gnu: emacs-ledger-mode: Fix autoload failure.
2c50e52 is described below

commit 2c50e52ab8228634ce1626dc174970f4a4321d61
Author: Brant Gardner <address@hidden>
AuthorDate: Wed Dec 25 10:11:41 2019 -0600

    gnu: emacs-ledger-mode: Fix autoload failure.
    
    * gnu/packages/finance.scm (emacs-ledger-mode)[arguments]: Replace the
      'relocate-elisp' phase by a 'patch-site-dir' phase to put the files in the
      right directory and a 'generate-autoload' phase to make the autoload file.
    
    Signed-off-by: Guillaume Le Vaillant <address@hidden>
---
 gnu/packages/finance.scm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index ce3033c..b24a9bf 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -288,6 +288,12 @@ in ability, and easy to use.")
          #:tests? #f ; there are none
          #:phases
          (modify-phases %standard-phases
+           (add-after 'unpack 'patch-site-dir
+             (lambda _
+               (substitute* "CMakeLists.txt"
+                 (("DESTINATION share/emacs/site-lisp/ledger-mode")
+                  "DESTINATION share/emacs/site-lisp"))
+               #t))
            (add-before 'build 'patch-path
              (lambda* (#:key inputs #:allow-other-keys)
                (let ((ledger (assoc-ref inputs "ledger")))
@@ -303,17 +309,12 @@ in ability, and easy to use.")
                  (invoke "makeinfo" "-o" target
                          "../source/doc/ledger-mode.texi"))
                #t))
-           (add-after 'install 'relocate-elisp
+           (add-after 'install 'generate-autoload
              (lambda* (#:key outputs #:allow-other-keys)
                (let* ((site-dir (string-append (assoc-ref outputs "out")
-                                               "/share/emacs/site-lisp"))
-                      (guix-dir (string-append site-dir "/guix.d"))
-                      (orig-dir (string-append site-dir "/ledger-mode"))
-                      (dest-dir (string-append guix-dir "/ledger-mode")))
-                 (mkdir-p guix-dir)
-                 (rename-file orig-dir dest-dir)
-                 (emacs-generate-autoloads ,name dest-dir)
-                 #t))))))
+                                               "/share/emacs/site-lisp")))
+                 (emacs-generate-autoloads ,name site-dir))
+               #t)))))
       (inputs
        `(("ledger" ,ledger)))
       (native-inputs