bug#45316: [PATCH 11/26] gnu: emacs-edbi: Adjust following emacs-build-system changes.

[Maxim Cournoyer]

* gnu/packages/emacs-xyz.scm (emacs-edbi)[arguments]
{include}: Extend rather than override %default-include.
[phases]{patch-path}: Adjust installation prefix.
edb#    buffering.patch
---
 gnu/packages/emacs-xyz.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0ff904af19..3e4dae5314 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -20330,14 +20330,13 @@ asynchronous communications, the RPC response is 
fairly good.")
        `(("emacs-e2wm" ,emacs-e2wm)
          ("emacs-epc" ,emacs-epc)))
       (arguments
-       `(#:include '("\\.el$" "\\.pl$")
+       `(#:include (cons "^[^/]*\\.pl$" %default-include)
          #:phases
          (modify-phases %standard-phases
            (add-after 'install 'patch-path
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let ((perl (assoc-ref inputs "perl"))
-                     (dir (string-append  (assoc-ref outputs "out")
-                                          "/share/emacs/site-lisp")))
+                     (dir (outputs->elpa-install-dir outputs)))
                  (substitute* (string-append dir  "/edbi.el")
                    (("\"perl\"") (string-append "\"" perl "/bin/perl\"")))
                  (chmod (string-append dir "/edbi-bridge.pl") #o555)
-- 
2.29.2