diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-07-02 01:03:10 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-07-02 01:35:39 +0200 |
| commit | 08005c6579f602c34c7eaa6403b1c3aadf7627a8 (patch) | |
| tree | d07c5a20e5d6065561d06a1f242edfb9e8789229 | |
| parent | e36a71721630a827a094ad07f250eada16d1f674 (diff) | |
| download | guix-08005c6579f602c34c7eaa6403b1c3aadf7627a8.tar.gz | |
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.
| -rw-r--r-- | guix/build/gnu-build-system.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index a6f1c73e0a..e2aa0e1799 100644 --- 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))))) |