guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: tlp: Install all files.


From: Tobias Geerinckx-Rice
Subject: 01/01: gnu: tlp: Install all files.
Date: Wed, 3 May 2017 12:29:52 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit cef3f14644d86391a6e9a814dca4bfd500bc064f
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Wed May 3 17:22:33 2017 +0200

    gnu: tlp: Install all files.
    
    * gnu/packages/linux.scm (tlp)[arguments]: Add ‘fix-installation’ phase so
    the installation no longer aborts half-way, and use ‘zero?’ in the install
    phase so this cannot go undetected again.
---
 gnu/packages/linux.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a5a2ea3..9db8be9 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3658,7 +3658,7 @@ Light is the successor of lightscript.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (delete 'configure)
+         (delete 'configure)            ; no configure script
          (add-before 'build 'setenv
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
@@ -3673,10 +3673,14 @@ Light is the successor of lightscript.")
                (setenv "TLP_SHCPL"
                        (string-append out 
"/share/bash-completion/completions"))
                (setenv "TLP_MAN" (string-append out "/share/man")))))
-         (delete 'check)
+         (delete 'check)                ; no tests
+         (add-before 'install 'fix-installation
+           (lambda _
+             ;; Stop the Makefile from trying to create system directories.
+             (substitute* "Makefile" (("\\[ -f \\$\\(_CONF\\) \\]") "#"))))
          (replace 'install
            (lambda _
-             (system "make install-tlp install-man")))
+             (zero? (system* "make" "install-tlp" "install-man"))))
          (add-after 'install 'wrap
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((bin (string-append (assoc-ref outputs "out") "/bin"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]