Paste number 322703: Artanis patch

Paste number 322703: Artanis patch
Pasted by: itorres
When:4 years, 3 days ago
Share:Tweet this! | http://paste.lisp.org/+6WZZ
Channel:None
Paste contents:
Raw Source | XML | Display As
From a611f67ca5859ee460027c0989632b241dcb2496 Mon Sep 17 00:00:00 2001
From: Ignacio Torres Masdeu <i@itorres.net>
Date: Tue, 9 Aug 2016 02:23:23 +0200
Subject: [PATCH] Fix artanis paths

---
 gnu/packages/guile.scm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index f26cc22..36f459d 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -300,24 +300,24 @@ without requiring the source code to be rewritten.")
      '(#:make-flags
        ;; TODO: The documentation must be built with the `docs' target.
        (let* ((out (assoc-ref %outputs "out"))
-              (dir (string-append out "/share/guile/site/2.0")))
+              (mod_dir "/share/guile/site/2.0"))
          ;; Don't use (%site-dir) for site paths.
-         (list (string-append "MOD_PATH=" dir)
-               (string-append "MOD_COMPILED_PATH=" dir)
-               (string-append "DESTDIR=" out)))
+         (list (string-append "MOD_PATH=" mod_dir)
+               (string-append "MOD_COMPILED_PATH=" mod_dir)
+               (string-append "PREFIX=" out)))
        #:test-target "test"
        #:phases
        (modify-phases %standard-phases
          (add-before
-          'install 'substitute-root-dir
+          'configure 'substitute-before-config
           (lambda* (#:key outputs #:allow-other-keys)
             (let ((out  (assoc-ref outputs "out")))
-              (substitute* "Makefile"   ;ignore the execution of bash.bashrc
-                ((" /etc/bash.bashrc") " /dev/null"))
-              (substitute* "Makefile"   ;set the root of config files to OUT
-                ((" /etc") (string-append " " out "/etc")))
-              (mkdir-p (string-append out "/bin")) ;for the `art' executable
-              #t))))))
+              (substitute* "Makefile.in"
+                (("\\$\\(DESTDIR\\)/\\$\\(PREFIX\\)")
+                 "$(PREFIX)"))
+              (substitute* "Makefile.in"
+                (("\\$\\(DESTDIR\\)")
+                 "$(PREFIX)"))))))))
     (synopsis "Web application framework written in Guile")
     (description "GNU Artanis is a web application framework written in Guile
 Scheme.  A web application framework (WAF) is a software framework that is
-- 
2.7.4

This paste has no annotations.

Colorize as:
Show Line Numbers

Lisppaste pastes can be made by anyone at any time. Imagine a fearsomely comprehensive disclaimer of liability. Now fear, comprehensively.