From 08005c6579f602c34c7eaa6403b1c3aadf7627a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 2 Jul 2012 01:03:10 +0200
Subject: [PATCH] gnu-build-system: Fix "libdir" and "includedir" for
multiple-output drvs.
* guix/build/gnu-build-system.scm (configure): Change `--libdir' and
`--includedir' to LIBDIR + "/lib" and INCLUDEDIR + "/include",
respectively.
---
guix/build/gnu-build-system.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index a6f1c73e0ad..e2aa0e17990 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -64,10 +64,11 @@ (define* (configure #:key outputs (configure-flags '()) #:allow-other-keys)
"--enable-fast-install"
(string-append "--prefix=" prefix)
`(,@(if libdir
- (list (string-append "--libdir=" libdir))
+ (list (string-append "--libdir=" libdir "/lib"))
'())
,@(if includedir
- (list (string-append "--includedir=" includedir))
+ (list (string-append "--includedir="
+ includedir "/include"))
'())
,@configure-flags)))))
--
GitLab