diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-22 16:54:26 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-23 10:01:30 +0200 |
| commit | 0c8372d9c7374eafc035718749d81b8e8317f62e (patch) | |
| tree | a3de3b1f18c970b74886ce62131a8b1b644b4183 /pkgs | |
| parent | 1d11c1dc48a3849f447350681ebba9d8cb97b979 (diff) | |
| download | nixlib-0c8372d9c7374eafc035718749d81b8e8317f62e.tar nixlib-0c8372d9c7374eafc035718749d81b8e8317f62e.tar.gz nixlib-0c8372d9c7374eafc035718749d81b8e8317f62e.tar.bz2 nixlib-0c8372d9c7374eafc035718749d81b8e8317f62e.tar.lz nixlib-0c8372d9c7374eafc035718749d81b8e8317f62e.tar.xz nixlib-0c8372d9c7374eafc035718749d81b8e8317f62e.tar.zst nixlib-0c8372d9c7374eafc035718749d81b8e8317f62e.zip | |
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.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 4 |
1 files changed, 3 insertions, 1 deletions
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 |