* Allow "make install" to be overriden using $installCommand.
svn path=/nixpkgs/trunk/; revision=7340
This commit is contained in:
parent
e6f589d4bf
commit
0a91ca3091
1 changed files with 8 additions and 4 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue