summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-11-02 17:53:17 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-11-02 17:53:17 (GMT)
commit67dcf89760af14e65e2c62ebba513c987086b355 (patch)
tree108e872aa6f59cf4be3df3a627b2ce50f9030bef /configure
parent7c8edecd486b71ff84cfaf278d9b1295e24766b9 (diff)
downloadQt-67dcf89760af14e65e2c62ebba513c987086b355.zip
Qt-67dcf89760af14e65e2c62ebba513c987086b355.tar.gz
Qt-67dcf89760af14e65e2c62ebba513c987086b355.tar.bz2
simplify recursive symlinking
the jira issue itself has been already fixed, but in a somewhat arcane way. this one is better maintainable. Reviewed-by: joerg Task-number: QTBUG-14955
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 2 insertions, 8 deletions
diff --git a/configure b/configure
index 0152c8e..1b2abf4 100755
--- a/configure
+++ b/configure
@@ -2429,14 +2429,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.