~ruther/guix-local: gnu-build-system: Fix "libdir" and "includedir" for multiple-output drvs.

08005c6579f602c34c7eaa6403b1c3aadf7627a8 — Ludovic Courtès 13 years ago e36a717

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.

patch browse .tar.gz

1 files changed, 3 insertions(+), 2 deletions(-)

M guix/build/gnu-build-system.scm

M guix/build/gnu-build-system.scm => guix/build/gnu-build-system.scm +3 -2

@@ 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)))))