From a035d07dfa6cbddccfa0476e2009d19bdf296941 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer 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