From 4583ab15437c7744e8f08adafa1baccec238c1fa Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 18 Aug 2010 17:49:32 +0200 Subject: fix shadow builds with scratchbox seems it doesn't grok xargs -I. as some other unixes don't grok cp -s, we have two paths now ... Reviewed-by: joerg --- configure | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 7c3f9a3..bd69a0a 100755 --- a/configure +++ b/configure @@ -2414,10 +2414,15 @@ if [ "$OPT_SHADOW" = "yes" ]; then # Special case for mkspecs/features directory. # To be able to place .prf files into a shadow build directory, # we're creating links for files only. The directory structure is reproduced. - # A simple "cp -rs" doesn't work on Mac. :( rm -rf "$outpath/mkspecs/features" - find "$relpath/mkspecs/features" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p - find "$relpath/mkspecs/features" -type f | sed "s,^$relpath/,," | xargs -n 1 -I % ln -s "$relpath/%" "$outpath/%" + if [ "$UNAME_SYSTEM" = "Linux" ]; then + # This works with GNU coreutils, and is needed for ScratchBox + cp -rs "$relpath/mkspecs/features" "$outpath/mkspecs/features" + else + # A simple "cp -rs" doesn't work on Mac. :( + find "$relpath/mkspecs/features" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p + find "$relpath/mkspecs/features" -type f | sed "s,^$relpath/,," | xargs -n 1 -I % ln -s "$relpath/%" "$outpath/%" + fi # symlink the doc directory rm -rf "$outpath/doc" -- cgit v0.12