diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-13 20:08:24 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-13 20:08:24 +0000 |
| commit | 0a91ca30911e54af6fa76c4c17ade3f2f8ba4674 (patch) | |
| tree | f52a6165d6f12b4bef7241f44818ae49ed3d39f0 /pkgs | |
| parent | e6f589d4bfe8b56443163815a0a60b91f2345257 (diff) | |
| download | nixlib-0a91ca30911e54af6fa76c4c17ade3f2f8ba4674.tar nixlib-0a91ca30911e54af6fa76c4c17ade3f2f8ba4674.tar.gz nixlib-0a91ca30911e54af6fa76c4c17ade3f2f8ba4674.tar.bz2 nixlib-0a91ca30911e54af6fa76c4c17ade3f2f8ba4674.tar.lz nixlib-0a91ca30911e54af6fa76c4c17ade3f2f8ba4674.tar.xz nixlib-0a91ca30911e54af6fa76c4c17ade3f2f8ba4674.tar.zst nixlib-0a91ca30911e54af6fa76c4c17ade3f2f8ba4674.zip | |
* Allow "make install" to be overriden using $installCommand.
svn path=/nixpkgs/trunk/; revision=7340
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/stdenv/generic/setup-new2.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/stdenv/generic/setup-new2.sh b/pkgs/stdenv/generic/setup-new2.sh index 6e5993e90dc4..401a655632b9 100644 --- a/pkgs/stdenv/generic/setup-new2.sh +++ b/pkgs/stdenv/generic/setup-new2.sh @@ -629,10 +629,14 @@ installW() { eval "$preInstall" ensureDir "$prefix" - - if test -z "$dontMakeInstall"; then - echo "install flags: $installFlags ${installFlagsArray[@]}" - make install $installFlags "${installFlagsArray[@]}" || fail + + if test -z "$installCommand"; then + if test -z "$dontMakeInstall"; then + echo "install flags: $installFlags ${installFlagsArray[@]}" + make install $installFlags "${installFlagsArray[@]}" || fail + fi + else + eval "$installCommand" fi if test -z "$dontStrip" -a "$NIX_STRIP_DEBUG" = 1; then |