03/05: gnu: guile-json: Remove hard-coded Guile effective version.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit ffc72ec6dfb02bca3e282ccc1b6c00da6e7fbcaf
Author: Ludovic Courtès <address@hidden>
Date:   Wed Sep 7 18:27:11 2016 +0200

    gnu: guile-json: Remove hard-coded Guile effective version.
    
    * gnu/packages/guile.scm (guile-json)[snippet]: Modify 'ac_subst_vars'
    in 'configure', and use "@GUILE_EFFECTIVE_VERSION@" instead of "2.0" in
    'Makefile.in'.
---
 gnu/packages/guile.scm |   30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 195af54..bd9902d 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -514,19 +514,23 @@ for Guile\".")
     (name "guile-json")
     (version "0.5.0")
     (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://savannah/guile-json/guile-json-"
-                                 version ".tar.gz"))
-             (sha256
-              (base32
-               "0l8a34l92nrdszy7ykycfvr8y0n0yi5qb3ccliycvpvf9mzk5n8d"))
-             (modules '((guix build utils)))
-             (snippet
-              ;; Make sure everything goes under .../site/2.0, like Guile's
-              ;; search paths expects.
-              '(substitute* '("Makefile.in" "json/Makefile.in")
-                 (("moddir =.*/share/guile/site" all)
-                  (string-append all "/2.0"))))))
+              (method url-fetch)
+              (uri (string-append "mirror://savannah/guile-json/guile-json-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "0l8a34l92nrdszy7ykycfvr8y0n0yi5qb3ccliycvpvf9mzk5n8d"))
+              (modules '((guix build utils)))
+              (snippet
+               ;; Make sure everything goes under .../site/X.Y, like Guile's
+               ;; search paths expects.
+               '(begin
+                  (substitute* "configure"
+                    (("ac_subst_vars='")
+                     "ac_subst_vars='GUILE_EFFECTIVE_VERSION\n"))
+                  (substitute* '("Makefile.in" "json/Makefile.in")
+                    (("moddir =.*/share/guile/site" all)
+                     (string-append all "/@GUILE_EFFECTIVE_VERSION@")))))))
     (build-system gnu-build-system)
     (native-inputs `(("guile" ,guile-2.0)))
     (home-page "http://savannah.nongnu.org/projects/guile-json/";)