* Allow "make install" to be overriden using $installCommand.
svn path=/nixpkgs/trunk/; revision=7340
This commit is contained in:
parent
e6f589d4bf
commit
0a91ca3091
@ -629,10 +629,14 @@ installW() {
|
|||||||
eval "$preInstall"
|
eval "$preInstall"
|
||||||
|
|
||||||
ensureDir "$prefix"
|
ensureDir "$prefix"
|
||||||
|
|
||||||
if test -z "$dontMakeInstall"; then
|
if test -z "$installCommand"; then
|
||||||
echo "install flags: $installFlags ${installFlagsArray[@]}"
|
if test -z "$dontMakeInstall"; then
|
||||||
make install $installFlags "${installFlagsArray[@]}" || fail
|
echo "install flags: $installFlags ${installFlagsArray[@]}"
|
||||||
|
make install $installFlags "${installFlagsArray[@]}" || fail
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
eval "$installCommand"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -z "$dontStrip" -a "$NIX_STRIP_DEBUG" = 1; then
|
if test -z "$dontStrip" -a "$NIX_STRIP_DEBUG" = 1; then
|
||||||
|
Loading…
Reference in New Issue
Block a user