* Another sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15269

pkgs/development/tools/build-managers/cmake/setup-hook.sh

@@ -11,13 +11,13 @@ fixCmakeFiles()
     echo "fixing cmake files"
     replaceArgs="-e -f -L -T /usr /FOO"
     replaceArgs="$replaceArgs -a NO_DEFAULT_PATH \"\" -a NO_SYSTEM_PATH \"\""
-    find $1 -type f -name "*.cmake" | xargs replace-literal ${replaceArgs}
+    find $1 -type f -name "*.cmake" -print0 | xargs -0 replace-literal ${replaceArgs}
 }
 
 cmakeConfigurePhase()
 {
     eval "$preConfigure"
-    
+
     if test -z "$dontFixCmake"; then
         fixCmakeFiles .
     fi
@@ -33,9 +33,9 @@ cmakeConfigurePhase()
     fi
 
     echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}"
-    
+
     cmake ${cmakeDir:-.} $cmakeFlags ${cmakeFlagsArray[@]}
-    
+
     eval "$postConfigure"
 }