[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/15: gnu: chez-scheme: Fix ‘install-doc’ phase.
From: |
guix-commits |
Subject: |
07/15: gnu: chez-scheme: Fix ‘install-doc’ phase. |
Date: |
Sat, 16 Feb 2019 14:52:35 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit 95b4f7ca7aa6391af10fef637c95f42c4a01debb
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Sat Feb 16 15:25:32 2019 +0100
gnu: chez-scheme: Fix ‘install-doc’ phase.
* gnu/packages/chez.scm (chez-cheme)[arguments]: Find ‘installsh’.
Remove some unnecessary code.
---
gnu/packages/chez.scm | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm
index 4a7fe0b..8476eef 100644
--- a/gnu/packages/chez.scm
+++ b/gnu/packages/chez.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Federico Beffa <address@hidden>
;;; Copyright © 2016 Efraim Flashner <address@hidden>
-;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -179,17 +179,18 @@
;; Installation of the documentation requires a running "chez".
(add-after 'install 'install-doc
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((bin (string-append (assoc-ref outputs "out") "/bin"))
- (doc (string-append (assoc-ref outputs "doc")
+ (let ((doc (string-append (assoc-ref outputs "doc")
"/share/doc/" ,name "-" ,version)))
- (setenv "HOME" (getcwd))
- (setenv "PATH" (string-append (getenv "PATH") ":" bin))
- (with-directory-excursion "stex"
- (system* "make" (string-append "BIN=" bin)))
(system* "make" "docs")
(with-directory-excursion "csug"
(substitute* "Makefile"
- (("/tmp/csug9") doc))
+ ;; The ‘installdir=’ can't be overruled on the command line.
+ (("/tmp/csug9") doc)
+ ;; $m is the ‘machine type’, e.g. ‘ta6le’ on x86_64, but is
+ ;; set incorrectly for some reason, e.g. to ‘a6le’ on
x86_64.
+ ;; Avoid the whole mess by running the (machine-independent)
+ ;; ‘installsh’ script at its original location.
+ (("\\$m/installsh") "makefiles/installsh"))
(system* "make" "install")
(install-file "csug.pdf" doc))
(with-directory-excursion "release_notes"
- branch master updated (6cf48e8 -> dcc2626), guix-commits, 2019/02/16
- 03/15: gnu: chez-srfi: Don't use unstable tarball., guix-commits, 2019/02/16
- 02/15: gnu: chez-fmt: Return #t from all phases., guix-commits, 2019/02/16
- 01/15: gnu: chez-web: Return #t from all phases., guix-commits, 2019/02/16
- 09/15: gnu: nanopass: Don't use unstable tarball., guix-commits, 2019/02/16
- 07/15: gnu: chez-scheme: Fix ‘install-doc’ phase.,
guix-commits <=
- 04/15: gnu: chez-web: Use GIT- helpers., guix-commits, 2019/02/16
- 10/15: gnu: stex: Don't use unstable tarball., guix-commits, 2019/02/16
- 11/15: gnu: chez-scheme: Don't use unstable tarball., guix-commits, 2019/02/16
- 05/15: gnu: chez-matchable: Don't use unstable tarball., guix-commits, 2019/02/16
- 13/15: gnu: chez-scmutils: Don't use unstable tarball., guix-commits, 2019/02/16
- 14/15: gnu: chez-scmutils: Return #t from all phases., guix-commits, 2019/02/16
- 15/15: gnu: chez-sockets: Use GIT- helpers., guix-commits, 2019/02/16
- 06/15: gnu: chez-irregex: Don't use unstable tarball., guix-commits, 2019/02/16
- 08/15: gnu: chez-scheme: Return #t from all phases., guix-commits, 2019/02/16
- 12/15: gnu: chez-mit: Don't use unstable tarball., guix-commits, 2019/02/16