diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 17:30:40 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 17:30:40 +0000 |
| commit | ed8fff32af8ca4c100adfadfbb5931ab2f65e982 (patch) | |
| tree | f01f1b9e7893b27d3ff707cecbee58177ce47c16 /pkgs | |
| parent | 81025a05df1f7ba33dacc47407a13bb31721d853 (diff) | |
| download | nixpkgs-ed8fff32af8ca4c100adfadfbb5931ab2f65e982.tar nixpkgs-ed8fff32af8ca4c100adfadfbb5931ab2f65e982.tar.gz nixpkgs-ed8fff32af8ca4c100adfadfbb5931ab2f65e982.tar.bz2 nixpkgs-ed8fff32af8ca4c100adfadfbb5931ab2f65e982.tar.lz nixpkgs-ed8fff32af8ca4c100adfadfbb5931ab2f65e982.tar.xz nixpkgs-ed8fff32af8ca4c100adfadfbb5931ab2f65e982.tar.zst nixpkgs-ed8fff32af8ca4c100adfadfbb5931ab2f65e982.zip | |
* Pass makeFlags to `make install' as well. This is because quite
often the same flags need to be passed to both `make' and `make install'. Added a variable buildFlags for flags that should only be passed to `make'. svn path=/nixpkgs/trunk/; revision=7491
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/libcap/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/setup-new2.sh | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index aac8c06172d..a0adb3813fd 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { preBuild = " substituteInPlace libcap/Makefile --replace /usr/include ${stdenv.glibc}/include - installFlags=\"LIBDIR=$out/lib INCDIR=$out/include SBINDIR=$out/sbin MANDIR=$out/man\" + makeFlags=\"LIBDIR=$out/lib INCDIR=$out/include SBINDIR=$out/sbin MANDIR=$out/man\" "; patches = [ diff --git a/pkgs/stdenv/generic/setup-new2.sh b/pkgs/stdenv/generic/setup-new2.sh index aa85f5edbf7..595f0f36490 100644 --- a/pkgs/stdenv/generic/setup-new2.sh +++ b/pkgs/stdenv/generic/setup-new2.sh @@ -566,8 +566,10 @@ buildW() { eval "$preBuild" - echo "make flags: $makeFlags ${makeFlagsArray[@]}" - make $makeFlags "${makeFlagsArray[@]}" || fail + echo "make flags: $makeFlags ${makeFlagsArray[@]} $buildFlags ${buildFlagsArray[@]}" + make \ + $makeFlags "${makeFlagsArray[@]}" \ + $buildFlags "${buildFlagsArray[@]}" || fail eval "$postBuild" } @@ -638,8 +640,10 @@ installW() { if test -z "$installTargets"; then installTargets=install fi - echo "install flags: $installTargets $installFlags ${installFlagsArray[@]}" - make $installTargets $installFlags "${installFlagsArray[@]}" || fail + echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}" + make $installTargets \ + $makeFlags ${makeFlagsArray[@]} \ + $installFlags "${installFlagsArray[@]}" || fail fi else eval "$installCommand" |