From 95b4f7ca7aa6391af10fef637c95f42c4a01debb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sat, 16 Feb 2019 15:25:32 +0100
Subject: [PATCH] =?UTF-8?q?gnu:=20chez-scheme:=20Fix=20=E2=80=98install-do?=
=?UTF-8?q?c=E2=80=99=20phase.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* 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 4a7fe0bfca0..8476eefe126 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 <beffa@fbengineering.ch>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -179,17 +179,18 @@ (define-public chez-scheme
;; 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"
--
GitLab