diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 17:26:43 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 17:26:43 +0000 |
| commit | 81025a05df1f7ba33dacc47407a13bb31721d853 (patch) | |
| tree | 41b7be419dae9fc6c4c16f69fb4cf2c43e1877e8 /pkgs | |
| parent | 7ca90544209689e55a6d30ca8cb38f9a7ed99898 (diff) | |
| download | nixpkgs-81025a05df1f7ba33dacc47407a13bb31721d853.tar nixpkgs-81025a05df1f7ba33dacc47407a13bb31721d853.tar.gz nixpkgs-81025a05df1f7ba33dacc47407a13bb31721d853.tar.bz2 nixpkgs-81025a05df1f7ba33dacc47407a13bb31721d853.tar.lz nixpkgs-81025a05df1f7ba33dacc47407a13bb31721d853.tar.xz nixpkgs-81025a05df1f7ba33dacc47407a13bb31721d853.tar.zst nixpkgs-81025a05df1f7ba33dacc47407a13bb31721d853.zip | |
* Variable $installTargets to override the install target in
installPhase. svn path=/nixpkgs/trunk/; revision=7490
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/stdenv/generic/setup-new2.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/setup-new2.sh b/pkgs/stdenv/generic/setup-new2.sh index ddd171fae14..aa85f5edbf7 100644 --- a/pkgs/stdenv/generic/setup-new2.sh +++ b/pkgs/stdenv/generic/setup-new2.sh @@ -635,8 +635,11 @@ installW() { if test -z "$installCommand"; then if test -z "$dontMakeInstall"; then - echo "install flags: $installFlags ${installFlagsArray[@]}" - make install $installFlags "${installFlagsArray[@]}" || fail + if test -z "$installTargets"; then + installTargets=install + fi + echo "install flags: $installTargets $installFlags ${installFlagsArray[@]}" + make $installTargets $installFlags "${installFlagsArray[@]}" || fail fi else eval "$installCommand" |