diff options
| -rw-r--r-- | maintainers/docs/todo.txt | 6 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/setup-new2.sh | 14 |
2 files changed, 6 insertions, 14 deletions
diff --git a/maintainers/docs/todo.txt b/maintainers/docs/todo.txt index 79432c85d142..02d7b041232f 100644 --- a/maintainers/docs/todo.txt +++ b/maintainers/docs/todo.txt @@ -2,8 +2,6 @@ directories for libraries (like setup.sh does now). [do we want this?] -* In setup.sh: add configureFlagsArray or something - * Inform freedesktop people that Xaw requires Xpm. * After building gcc, filter out references to /tmp/nix... in @@ -14,7 +12,3 @@ [Move from libbonoboui] * Fix the bzip2 build generically. - -* In stdenv/setup.sh: put the call to patchelf etc. in a separate - phase (fixupPhase?) that comes after the installPhase. This is so - that when one overrides installPhase, the fixup stuff is still done. 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 |