[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Fix artanis paths
From: |
Ignacio Torres Masdeu |
Subject: |
[PATCH] Fix artanis paths |
Date: |
Tue, 09 Aug 2016 02:05:19 +0200 |
User-agent: |
mu4e 0.9.16; emacs 24.5.1 |
The last patch[1] for artanis added the DESTDIR path to place files in
$DESTDIR/etc.
[1] http://lists.gnu.org/archive/html/guix-devel/2016-03/msg00813.html
This didn't account for the fact that $DESTDIR is used in the build
system install process as a prefix for other files and the effect was
that those files were effectively copied in $out/$out/{bin/share}:
$ find /gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/
/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/
/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/bin
/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/gnu
/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/gnu/store
/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2
/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/bin
/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/bin/art
/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/share
/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/share/guile
/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/share/guile/site
/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/share/guile/site/2.0
/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/share/guile/site/2.0/artanis
/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/gnu/store/3nr3f0xvn9zc9v9nz8nsn9svcbrcn638-artanis-0.1.2/share/guile/site/2.0/artanis/commands.scm
This patch maintains the desired $DESTDIR/etc population while avoiding
the double concatenation.
>From 17b40a6d10d89c35b94a87fbc5b1d5bad4430f2f Mon Sep 17 00:00:00 2001
From: Ignacio Torres Masdeu <address@hidden>
Date: Tue, 9 Aug 2016 01:34:27 +0200
Subject: [PATCH] Fix artanis paths
---
gnu/packages/guile.scm | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index f26cc22..04b138a 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -300,24 +300,13 @@ 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)
+ (list (string-append "MOD_PATH=" mod_dir)
+ (string-append "MOD_COMPILED_PATH=" mod_dir)
+ "PREFIX="
(string-append "DESTDIR=" out)))
- #:test-target "test"
- #:phases
- (modify-phases %standard-phases
- (add-before
- 'install 'substitute-root-dir
- (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))))))
+ #:test-target "test"))
(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
- [PATCH] Fix artanis paths,
Ignacio Torres Masdeu <=