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.
This commit is contained in:
Ludovic Courtès 2012-07-02 01:03:10 +02:00
parent e36a717216
commit 08005c6579

View file

@ -64,10 +64,11 @@ (define* (configure #:key outputs (configure-flags '()) #:allow-other-keys)
"--enable-fast-install" "--enable-fast-install"
(string-append "--prefix=" prefix) (string-append "--prefix=" prefix)
`(,@(if libdir `(,@(if libdir
(list (string-append "--libdir=" libdir)) (list (string-append "--libdir=" libdir "/lib"))
'()) '())
,@(if includedir ,@(if includedir
(list (string-append "--includedir=" includedir)) (list (string-append "--includedir="
includedir "/include"))
'()) '())
,@configure-flags))))) ,@configure-flags)))))