From 0c8372d9c7374eafc035718749d81b8e8317f62e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Aug 2013 16:54:26 +0200
Subject: Respect the setOutputConfigureFlags attribute

If this attribute is set to true (default), then setup.sh will add
configure flags for multiple output support, such as --includedir.
---
 pkgs/stdenv/generic/setup.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'pkgs')

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 27c1d37df25f..0c1e3e736800 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -580,7 +580,7 @@ configurePhase() {
         done
     fi
 
-    if [ -z "$dontAddPrefix" ]; then
+    if [ -n "${setOutputConfigureFlags-1}" ]; then
         local _man="$man"
 
         # Put programs in the "bin" output.
@@ -606,7 +606,9 @@ configurePhase() {
             configureFlags="--includedir=$dev/include $configureFlags"
             installFlags="pkgconfigdir=$dev/lib/pkgconfig m4datadir=$dev/share/aclocal aclocaldir=$dev/share/aclocal $installFlags"
         fi
+    fi
 
+    if [ -z "$dontAddPrefix" ]; then
         configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
     fi
 
-- 
cgit 1.4.1