From 0a91ca30911e54af6fa76c4c17ade3f2f8ba4674 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 Dec 2006 20:08:24 +0000
Subject: [PATCH] * Allow "make install" to be overriden using $installCommand.

svn path=/nixpkgs/trunk/; revision=7340
---
 pkgs/stdenv/generic/setup-new2.sh | 12 ++++++++----
 1 file 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