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.
10 years ago · 08005c6579
1 changed files with 3 additions and 2 deletions
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@ -64,10 +64,11 @@
                  "--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)))))