diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-04 16:06:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-04 16:06:40 (GMT) |
| commit | 4cfd1f19fdcd1e61aa50feed5eb8228afff94e66 (patch) | |
| tree | 159a2f90ff7bb016fd166f1b18826aed2a460ac5 /configure | |
| parent | 953ff11a1b424dd288b6504c5a6f918acaebaa60 (diff) | |
| parent | 1a7a1172d048108c30a9890ce9477686711ad756 (diff) | |
| download | Qt-4cfd1f19fdcd1e61aa50feed5eb8228afff94e66.zip Qt-4cfd1f19fdcd1e61aa50feed5eb8228afff94e66.tar.gz Qt-4cfd1f19fdcd1e61aa50feed5eb8228afff94e66.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -2553,14 +2553,8 @@ if [ "$OPT_SHADOW" = "yes" ]; then ShadowMkspecs() { rm -rf "$outpath/mkspecs/$1" - if [ "$UNAME_SYSTEM" = "Linux" ]; then - # This works with GNU coreutils, and is needed for ScratchBox - cp -rs "$relpath/mkspecs/$1" "$outpath/mkspecs/$1" - else - # A simple "cp -rs" doesn't work on Mac. :( - find "$relpath/mkspecs/$1" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p - find "$relpath/mkspecs/$1" -type f | sed "s,^$relpath/,," | xargs -n 1 -I % ln -s "$relpath/%" "$outpath/%" - fi + find "$relpath/mkspecs/$1" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p + find "$relpath/mkspecs/$1" -type f | sed "s,^$relpath/,," | while read f; do ln -s "$relpath/$f" "$outpath/$f"; done } # Special case for mkspecs/features directory. |