summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2012-03-28 13:07:22 -0500
committerSimo Fält <simo.falt@nokia.com>2012-03-29 14:24:38 +0300
commit0cfef634ed4ffdd90b810266d291346bcec51c7c (patch)
treea802ea67572397354ec3dc01e432686f641f959b
parent14b6752894a4760929852d8969d70324d5d19812 (diff)
Avoid 'make install' on Windows
We normally don't 'make install' on Windows, so avoid it for the alpha. Change-Id: Ia5563791be249ea04abdda64b94e15afb2608add
-rwxr-xr-xbuild5
1 files changed, 4 insertions, 1 deletions
diff --git a/build b/build
index 7fc3ed48..a88114dd 100755
--- a/build
+++ b/build
@@ -371,7 +371,10 @@ sub build_project
}
$self->exeLowPriv("cd $module && $build_command") && die "'cd $module && $build_command' failed: $?";
$install_command = "$self->{MAKE} install" if (!defined $install_command);
- $self->exeHighPriv("cd $module && $install_command") && die "'cd $module && $install_command failed: $?";
+ ### TODO: Should be fixed after the alpha
+ unless ("$Config{osname}" =~ /mswin/i) {
+ $self->exeHighPriv("cd $module && $install_command") && die "'cd $module && $install_command failed: $?";
+ }
$self->mark_as_finished($module);
return 0;
}