diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 17:48:46 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 17:48:46 +0000 |
| commit | 2dd4e1b9d308949a018b0301148f997147da0bf0 (patch) | |
| tree | 48885cfe322736a8ed965a6e1b0e612e6086ce82 /pkgs/stdenv/generic | |
| parent | 8ab9a58e0d3ea85491ebf012cfda962d59f1b99b (diff) | |
| download | nixlib-2dd4e1b9d308949a018b0301148f997147da0bf0.tar nixlib-2dd4e1b9d308949a018b0301148f997147da0bf0.tar.gz nixlib-2dd4e1b9d308949a018b0301148f997147da0bf0.tar.bz2 nixlib-2dd4e1b9d308949a018b0301148f997147da0bf0.tar.lz nixlib-2dd4e1b9d308949a018b0301148f997147da0bf0.tar.xz nixlib-2dd4e1b9d308949a018b0301148f997147da0bf0.tar.zst nixlib-2dd4e1b9d308949a018b0301148f997147da0bf0.zip | |
* Remove dontMakeInstall, it's no longer necessary (just set
installCommand to true or something). svn path=/nixpkgs/trunk/; revision=7495
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/setup-new2.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/stdenv/generic/setup-new2.sh b/pkgs/stdenv/generic/setup-new2.sh index e39a0772a32c..f25d89723bde 100644 --- a/pkgs/stdenv/generic/setup-new2.sh +++ b/pkgs/stdenv/generic/setup-new2.sh @@ -642,15 +642,13 @@ installW() { ensureDir "$prefix" if test -z "$installCommand"; then - if test -z "$dontMakeInstall"; then - if test -z "$installTargets"; then - installTargets=install - fi - echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}" - make $installTargets \ - $makeFlags ${makeFlagsArray[@]} \ - $installFlags "${installFlagsArray[@]}" || fail + if test -z "$installTargets"; then + installTargets=install fi + echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}" + make $installTargets \ + $makeFlags ${makeFlagsArray[@]} \ + $installFlags "${installFlagsArray[@]}" || fail else eval "$installCommand" fi |