From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:58314) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ik9HS-0006E9-U1 for guix-patches@gnu.org; Wed, 25 Dec 2019 11:13:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ik9HR-00054V-TR for guix-patches@gnu.org; Wed, 25 Dec 2019 11:13:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48632) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ik9HR-00054O-QS for guix-patches@gnu.org; Wed, 25 Dec 2019 11:13:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ik9HR-0003YE-M8 for guix-patches@gnu.org; Wed, 25 Dec 2019 11:13:01 -0500 Subject: [bug#38741] [PATCH] Fix emacs-ledger-mode failing to autoload Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:58230) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ik9GZ-0006Cm-Mh for guix-patches@gnu.org; Wed, 25 Dec 2019 11:12:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ik9GY-0004qA-Jr for guix-patches@gnu.org; Wed, 25 Dec 2019 11:12:07 -0500 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:51083) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ik9GY-0004pA-6O for guix-patches@gnu.org; Wed, 25 Dec 2019 11:12:06 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 84B9C390 for ; Wed, 25 Dec 2019 11:12:02 -0500 (EST) Mime-Version: 1.0 Message-Id: Date: Wed, 25 Dec 2019 10:11:41 -0600 From: "Brant Gardner" Content-Type: text/plain List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38741@debbugs.gnu.org * gnu/packages/finance.scm (emacs-ledger-mode): Fix emacs-ledger-mode failing to autoload --- 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 ce3033c054..ced85c44c2 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 -- 2.24.1