bug#27222: [PATCH] emacs-build-system install phase doesn't honor directory hierarchy

[Maxim Cournoyer <maxim.cournoyer@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 339 bytes --]

Hello,

The previous regexp would have worked, but what got me was that the
default keyword arguments values were duplicated (and I was fixing the
useless version in build/emac-build-system.scm instead of the one used
in build-system/emacs.scm).

The attached patch fixes this particular problem (tested with
ert-runner).

Thanks,

Maxim


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-build-system-emacs-Install-elisp-files-from-subdirec.patch --]
[-- Type: text/x-patch, Size: 2028 bytes --]

From a035d07dfa6cbddccfa0476e2009d19bdf296941 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sat, 3 Jun 2017 23:43:02 -0700
Subject: [PATCH] build-system: emacs: Install elisp files from subdirectories

* guix/build/emacs-build-system.scm (install)[include]: Get rid of default
value.
[exclude]: Likewise.
* guix/build/emacs-build-system.scm (emacs-build)[include]: Modify default
regexp value so that elisp files get matched (and installed) for any directory
depth level.
---
 guix/build-system/emacs.scm       | 2 +-
 guix/build/emacs-build-system.scm | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm
index 9a46ecfd2..a97fcedc3 100644
--- a/guix/build-system/emacs.scm
+++ b/guix/build-system/emacs.scm
@@ -83,7 +83,7 @@
                       (phases '(@ (guix build emacs-build-system)
                                   %standard-phases))
                       (outputs '("out"))
-                      (include ''("^[^/]*\\.el$" "^[^/]*\\.info$" "^doc/.*\\.info$"))
+                      (include ''("\\.el$" "^[^/]*\\.info$" "^doc/.*\\.info$"))
                       (exclude ''("^\\.dir-locals\\.el$" "-pkg\\.el$" "^[^/]*tests?\\.el$"))
                       (search-paths '())
                       (system (%current-system))
diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm
index 50af4be36..1373cb6f7 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -95,10 +95,7 @@ store in '.el' files."
           (substitute-cmd))))
     #t))
 
-(define* (install #:key outputs
-                  (include '("^[^/]*\\.el$" "^[^/]*\\.info$" "^doc/.*\\.info$"))
-                  (exclude '("^\\.dir-locals\\.el$" "-pkg\\.el$" "^[^/]*tests?\\.el$"))
-                  #:allow-other-keys)
+(define* (install #:key outputs include exclude #:allow-other-keys)
   "Install the package contents."
 
   (define source (getcwd))
-- 
2.13.0