From cef3f14644d86391a6e9a814dca4bfd500bc064f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 May 2017 17:22:33 +0200 Subject: gnu: tlp: Install all files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 a5a2ea3e0c..9db8be94a8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3658,7 +3658,7 @@ (define-public tlp (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 @@ (define-public tlp (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")) -- cgit v1.2.3