[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/05: gnu: lm-sensors: Add "lib" output.
|
From: |
Ludovic Courtès |
|
Subject: |
01/05: gnu: lm-sensors: Add "lib" output. |
|
Date: |
Mon, 25 Sep 2017 18:35:29 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 8ddf20b286226e0e777c95046d824b1e586277c9
Author: Dave Love <address@hidden>
Date: Mon Sep 25 11:42:07 2017 +0100
gnu: lm-sensors: Add "lib" output.
* gnu/packages/linux.scm (lm-sensors)[outputs]: Add "lib".
[arguments]: Fix up make flags.
(xsensors)[inputs]: Adjust accordingly.
Signed-off-by: Ludovic Courtès <address@hidden>
---
gnu/packages/linux.scm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 1c9888f..f13fbb0 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2368,11 +2368,16 @@ country-specific regulations for the wireless
spectrum.")
("flex" ,flex)
("bison" ,bison)
("which" ,which)))
+ (outputs '("lib" ;avoid perl in closure
+ "out"))
(arguments
`(#:tests? #f ; no 'check' target
#:make-flags (list (string-append "PREFIX=" %output)
- (string-append "ETCDIR=" %output "/etc")
- (string-append "MANDIR=" %output "/share/man"))
+ (string-append "ETCDIR=" (assoc-ref %outputs "lib")
"/etc")
+ (string-append "INCLUDEDIR="
+ (assoc-ref %outputs "lib") "/include")
+ (string-append "MANDIR=" %output "/share/man")
+ (string-append "LIBDIR=" (assoc-ref %outputs "lib")
"/lib"))
#:phases
(alist-delete
'configure
@@ -2462,7 +2467,7 @@ SMBus access.")
(base32
"1siplsfgvcxamyqf44h71jx6jdfmvhfm7mh0y1q8ps4zs6pj2zwh"))))
(build-system gnu-build-system)
- (inputs `(("lm-sensors" ,lm-sensors)
+ (inputs `(("lm-sensors" ,lm-sensors "lib")
("gtk" ,gtk+-2)))
(native-inputs `(("pkg-config" ,pkg-config)))
(arguments