01/02: build: emacs: Search for elisp in "share/emacs/site-lisp".

[Alex Kost]

alezost pushed a commit to branch master
in repository guix.

commit 2831675bfd4d4ba78f6511cf7698ee745d1fbf33
Author: Alex Kost <address@hidden>
Date:   Mon Jun 20 15:49:04 2016 +0300

    build: emacs: Search for elisp in "share/emacs/site-lisp".
    
    * guix/build/emacs-build-system.scm (emacs-inputs-el-directories):
    Add ".../share/emacs/site-lisp" directory to the returned result as
    elisp files can also be placed there.
---
 guix/build/emacs-build-system.scm |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/guix/build/emacs-build-system.scm 
b/guix/build/emacs-build-system.scm
index ab97001..44e8b0d 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -1,5 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Federico Beffa <address@hidden>
+;;; Copyright © 2016 David Thompson <address@hidden>
+;;; Copyright © 2016 Alex Kost <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -152,10 +154,11 @@ store in '.el' files."
 (define (emacs-inputs-el-directories dirs)
   "Build the list of Emacs Lisp directories from the Emacs package directory
 DIRS."
-  (map (lambda (d)
-         (string-append d %install-suffix "/"
-                        (store-directory->elpa-name-version d)))
-       dirs))
+  (append-map (lambda (d)
+                (list (string-append d "/share/emacs/site-lisp")
+                      (string-append d %install-suffix "/"
+                                     (store-directory->elpa-name-version d))))
+              dirs))
 
 (define (package-name-version->elpa-name-version name-ver)
   "Convert the Guix package NAME-VER to the corresponding ELPA name-version