* Remove dontMakeInstall, it's no longer necessary (just set
installCommand to true or something). svn path=/nixpkgs/trunk/; revision=7495
This commit is contained in:
parent
8ab9a58e0d
commit
2dd4e1b9d3
|
@ -2,8 +2,6 @@
|
||||||
directories for libraries (like setup.sh does now). [do we want
|
directories for libraries (like setup.sh does now). [do we want
|
||||||
this?]
|
this?]
|
||||||
|
|
||||||
* In setup.sh: add configureFlagsArray or something
|
|
||||||
|
|
||||||
* Inform freedesktop people that Xaw requires Xpm.
|
* Inform freedesktop people that Xaw requires Xpm.
|
||||||
|
|
||||||
* After building gcc, filter out references to /tmp/nix... in
|
* After building gcc, filter out references to /tmp/nix... in
|
||||||
|
@ -14,7 +12,3 @@
|
||||||
[Move from libbonoboui]
|
[Move from libbonoboui]
|
||||||
|
|
||||||
* Fix the bzip2 build generically.
|
* 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.
|
|
||||||
|
|
|
@ -642,7 +642,6 @@ installW() {
|
||||||
ensureDir "$prefix"
|
ensureDir "$prefix"
|
||||||
|
|
||||||
if test -z "$installCommand"; then
|
if test -z "$installCommand"; then
|
||||||
if test -z "$dontMakeInstall"; then
|
|
||||||
if test -z "$installTargets"; then
|
if test -z "$installTargets"; then
|
||||||
installTargets=install
|
installTargets=install
|
||||||
fi
|
fi
|
||||||
|
@ -650,7 +649,6 @@ installW() {
|
||||||
make $installTargets \
|
make $installTargets \
|
||||||
$makeFlags ${makeFlagsArray[@]} \
|
$makeFlags ${makeFlagsArray[@]} \
|
||||||
$installFlags "${installFlagsArray[@]}" || fail
|
$installFlags "${installFlagsArray[@]}" || fail
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
eval "$installCommand"
|
eval "$installCommand"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue