guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/03: gnu: guile-aspell: Remove hard-coded "site/2.0" from $(guilesited


From: Ludovic Courtès
Subject: 02/03: gnu: guile-aspell: Remove hard-coded "site/2.0" from $(guilesitedir).
Date: Thu, 6 Apr 2017 04:46:16 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 7295087eb1fad67978b7f787b8e92de3fdf70f91
Author: Ludovic Courtès <address@hidden>
Date:   Thu Apr 6 10:41:59 2017 +0200

    gnu: guile-aspell: Remove hard-coded "site/2.0" from $(guilesitedir).
    
    * gnu/packages/guile.scm (guile-aspell)[arguments]: Remove
      #:configure-flags.  Add 'set-guilesitedir' phase.
---
 gnu/packages/guile.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 99b2ca1..62a58dc 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1531,10 +1531,14 @@ type system, elevating types to first-class status.")
                 "0vpk5xj9m9qc702z3khmkwhgpb949qbsyz8kw2qycda6qnxk0077"))))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags (list (string-append "--with-guilesitedir="
-                                              (assoc-ref %outputs "out")
-                                              "/share/guile/site/2.0"))
-       #:phases (modify-phases %standard-phases
+     '(#:phases (modify-phases %standard-phases
+                  (add-before 'configure 'set-guilesitedir
+                    (lambda _
+                      (substitute* "Makefile.in"
+                        (("^guilesitedir =.*$")
+                         "guilesitedir = \
+$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
+                      #t))
                   (add-before 'build 'set-libaspell-file-name
                     (lambda* (#:key inputs #:allow-other-keys)
                       (let ((aspell (assoc-ref inputs "aspell")))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]