[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/04: gnu: txr: Fix license installation.
From: |
guix-commits |
Subject: |
03/04: gnu: txr: Fix license installation. |
Date: |
Tue, 20 Jul 2021 04:55:18 -0400 (EDT) |
glv pushed a commit to branch master
in repository guix.
commit 6a0658afa7388f2b9f55a2ef437ae0c2776e19b8
Author: Paul A. Patience <paul@apatience.com>
AuthorDate: Sat Jul 17 23:19:31 2021 -0400
gnu: txr: Fix license installation.
The install-license-files phase was installing LICENSE-CYG when it
shouldn't have, because that license applies only to TXR builds for
Microsoft Windows; and it was also ignoring the METALICENSE file.
However, TXR's Makefile was already installing the LICENSE and
METALICENSE files into share/txr (the datadir), so redirect them into
the appropriate doc directory and delete the install-license-files
phase.
* gnu/packages/lisp.scm (txr)[arguments]<#:phases>
{fix-license-installation}: New phase.
{install-license-files}: Delete phase.
Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
---
gnu/packages/lisp.scm | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index e6d09ce..dbeeb5c 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -931,6 +931,15 @@ the HTML documentation of TXR.")
#:test-target "tests"
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-license-installation
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "Makefile"
+ (("INSTALL(,.*LICENSE,.*)\\$\\(datadir\\)" _ match)
+ (string-append "INSTALL" match
+ (assoc-ref outputs "out")
+ "/share/doc/" ,name "-" ,version)))
+ #t))
+ (delete 'install-license-files)
(add-after 'unpack 'inhibit-doc-syms-generation
(lambda _
(substitute* "genman.txr"