public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Respect the setOutputConfigureFlags attribute

Browse Source 
If this attribute is set to true (default), then setup.sh will add
configure flags for multiple output support, such as --includedir.
This commit is contained in:
Eelco Dolstra 2013-08-22 16:54:26 +02:00
parent 1d11c1dc48
commit 0c8372d9c7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/stdenv/generic/setup.sh
View File

@ -580,7 +580,7 @@ configurePhase() {
done done
fi fi
if [ -z "$dontAddPrefix" ]; then if [ -n "${setOutputConfigureFlags-1}" ]; then
local _man="$man" local _man="$man"
# Put programs in the "bin" output. # Put programs in the "bin" output.
@ -606,7 +606,9 @@ configurePhase() {
configureFlags="--includedir=$dev/include $configureFlags" configureFlags="--includedir=$dev/include $configureFlags"
installFlags="pkgconfigdir=$dev/lib/pkgconfig m4datadir=$dev/share/aclocal aclocaldir=$dev/share/aclocal $installFlags" installFlags="pkgconfigdir=$dev/lib/pkgconfig m4datadir=$dev/share/aclocal aclocaldir=$dev/share/aclocal $installFlags"
fi fi
fi
if [ -z "$dontAddPrefix" ]; then
configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
fi fi