summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2012-03-28 13:07:22 -0500
committerQt by Nokia <qt-info@nokia.com>2012-04-05 04:35:38 +0200
commit72f4597c9da6e13e09fe3ba9f9ca6fe44c051f11 (patch)
tree9f1184d130dbc26113b563d9d29dbbc89423c487 /build
parentf1a52c15fac028718d6f8ff6d2174a23cecb0e16 (diff)
Avoid 'make install' on Windows
We normally don't 'make install' on Windows, so avoid it for the alpha. Change-Id: Ia5563791be249ea04abdda64b94e15afb2608add Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'build')
-rwxr-xr-xbuild5
1 files changed, 4 insertions, 1 deletions
diff --git a/build b/build
index 02014a72..8570010a 100755
--- a/build
+++ b/build
@@ -375,7 +375,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;
}