summary refs log tree commit diff
path: root/pkgs/stdenv/generic/setup-new2.sh
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/stdenv/generic/setup-new2.sh')
-rw-r--r--pkgs/stdenv/generic/setup-new2.sh14
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