diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-08 14:56:39 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-14 05:51:43 +0100 |
| commit | b9b8db07450bb61583a3e847d511e20f6a7e59bb (patch) | |
| tree | ff8aa5a80563d5a4c866b9857049f34ae45d2ae0 /configure | |
| parent | 2ad41f3ba71831b1a2634a616f7985de27af89cf (diff) | |
fix argument quoting when invoking "proper" configure
Change-Id: Idd22f7d267b83e1a4f2cc6df9994d82a5d361df7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -73,9 +73,7 @@ sub ensureDir { # `system', but also print the command sub system_v { - print "+ "; - print @_; - print "\n"; + print "+ @_\n"; return system(@_); } @@ -90,7 +88,7 @@ if (! -e "$relpath/qtbase/configure") { ensureDir("$outpath/qtbase"); chdir("$outpath/qtbase"); -my $ret = system_v("$relpath/qtbase/configure @ARGV"); +my $ret = system_v("$relpath/qtbase/configure", @ARGV); if ($ret != 0) { print "*** qtbase/configure exited with non-zero status.\n"; exit ($ret>>8) ; @@ -98,5 +96,5 @@ if ($ret != 0) { chdir("$outpath"); -$ret = system_v("$outpath/qtbase/bin/qmake $relpath/qt.pro"); +$ret = system_v("$outpath/qtbase/bin/qmake", "$relpath/qt.pro"); exit ($ret>>8); |