[Cmake-commits] CMake branch, master, updated. 78d505031f5302e923326698b034e7f89c18e0b5

[cmake-commits at cmake.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  78d505031f5302e923326698b034e7f89c18e0b5 (commit)
      from  f9bdbf8fd302ace1855dadf7d2fd637fc0a902fc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78d505031f5302e923326698b034e7f89c18e0b5
commit 78d505031f5302e923326698b034e7f89c18e0b5
Author: Bill Hoffman <bill.hoffman at kitware.com>
Date:   Tue Apr 13 09:28:16 2010 -0400

    Fix for bug #10544, make check was sent to the wrong log file

diff --git a/bootstrap b/bootstrap
index 25d6b68..bcd11a5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -777,7 +777,7 @@ if [ "x${cmake_parallel_make}" != "x" ]; then
   cmake_make_flags="${cmake_make_flags} -j ${cmake_parallel_make}"
 fi
 for a in ${cmake_make_processors}; do
-  if [ -z "${cmake_make_processor}" ] && cmake_try_make "${a}" "${cmake_make_flags}" >> cmake_bootstrap.log 2>&1; then
+  if [ -z "${cmake_make_processor}" ] && cmake_try_make "${a}" "${cmake_make_flags}" >> ../cmake_bootstrap.log 2>&1; then
     cmake_make_processor="${a}"
   fi
 done
@@ -786,19 +786,19 @@ if [ "x${cmake_original_make_flags}" != "x${cmake_make_flags}" ]; then
   if [ -z "${cmake_make_processor}" ]; then
     cmake_make_flags="${cmake_original_make_flags}"
     for a in ${cmake_make_processors}; do
-      if [ -z "${cmake_make_processor}" ] && cmake_try_make "${a}" "${cmake_make_flags}" >> cmake_bootstrap.log 2>&1; then
+      if [ -z "${cmake_make_processor}" ] && cmake_try_make "${a}" "${cmake_make_flags}" >> ../cmake_bootstrap.log 2>&1; then
         cmake_make_processor="${a}"
       fi
     done
   fi
 fi
 cd "${cmake_bootstrap_dir}"
-rm -rf "${cmake_bootstrap_dir}/${TMPFILE}"
 
 if [ -z "${cmake_make_processor}" ]; then
   cmake_error 8 "Cannot find appropriate Makefile processor on this system.
 Please specify one using environment variable MAKE."
 fi
+rm -rf "${cmake_bootstrap_dir}/${TMPFILE}"
 echo "Makefile processor on this system is: ${cmake_make_processor}"
 if [ "x${cmake_full_make_flags}" != "x${cmake_make_flags}" ]; then
   echo "---------------------------------------------"

-----------------------------------------------------------------------

Summary of changes:
 bootstrap |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake