Merge lp:~brianaker/gearmand/update-bootstrap-june into lp:gearmand

[Brian Aker]

=== modified file 'bootstrap.sh'
--- bootstrap.sh	2013-06-10 06:48:59 +0000
+++ bootstrap.sh	2013-06-21 06:23:39 +0000
@@ -430,7 +430,7 @@
       ret=$?
       ;;
     *)
-      run $CONFIGURE $BUILD_CONFIGURE_ARG
+      run $CONFIGURE "$BUILD_CONFIGURE_ARG"
       ret=$?
       ;;
   esac
@@ -1507,6 +1507,9 @@
 
 execute_job ()
 {
+  # We should always have a target by this point
+  assert MAKE_TARGET
+
   determine_target_platform
 
   determine_vcs
@@ -1518,10 +1521,6 @@
     return 1
   fi
 
-  if [ -z "$MAKE_TARGET" ]; then
-    MAKE_TARGET="make_default"
-  fi
-
   if $print_setup_opt -o  $debug; then
     echo 
     print_setup
@@ -1541,9 +1540,6 @@
     PREFIX_ARG="--prefix=$PREFIX"
   fi
 
-  # We should always have a target by this point
-  assert MAKE_TARGET
-
   if $CLEAN_OPTION; then
     make_maintainer_clean
   fi
@@ -1551,10 +1547,6 @@
   local MAKE_TARGET_ARRAY
   MAKE_TARGET_ARRAY=( $MAKE_TARGET )
 
-  if $jenkins_build_environment; then
-    use_banner $target
-  fi
-
   for target in "${MAKE_TARGET_ARRAY[@]}"
   do
     # If we are running inside of Jenkins, we want to only run some of the possible tests
@@ -1566,6 +1558,10 @@
       fi
     fi
 
+    if $jenkins_build_environment; then
+      use_banner $target
+    fi
+
     local snapshot_run=false
     local valgrind_run=false
 
@@ -1619,10 +1615,6 @@
         ;;
       'mingw')
         make_distclean
-        if ! check_mingw; then
-          die "mingw was not found"
-        fi
-
         if ! make_for_mingw; then
           die "Failed to build mingw: $?"
         fi
@@ -1766,6 +1758,13 @@
     fi
   fi
 
+  if [ -z "$MAKE_TARGET" ]; then
+    MAKE_TARGET="make_default"
+  fi
+
+  # We should always have a target by this point
+  assert MAKE_TARGET
+
   execute_job
   local ret=$?