From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ignacio Torres Masdeu Subject: [PATCH] Fix artanis paths Date: Tue, 09 Aug 2016 02:05:19 +0200 Message-ID: <86eg5yg62o.fsf@itorres.net> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60047) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWuYM-0002jH-QY for guix-devel@gnu.org; Mon, 08 Aug 2016 20:05:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bWuYH-0001h1-OC for guix-devel@gnu.org; Mon, 08 Aug 2016 20:05:53 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:33328) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWuYF-0001gH-C6 for guix-devel@gnu.org; Mon, 08 Aug 2016 20:05:49 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id CE37C20529 for ; Mon, 8 Aug 2016 20:05:36 -0400 (EDT) Received: from gaia (unknown [5.10.206.29]) by mail.messagingengine.com (Postfix) with ESMTPA id EF054F296E for ; Mon, 8 Aug 2016 20:05:35 -0400 (EDT) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org 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 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