X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=bootstrap.sh;h=606d63d660ad01574b207c4d6729ed203f87d08c;hb=820fcf318e11426bdb72345948c56738b5e12da4;hp=6a93c970553b2509bb62d47cae14e27017517fdc;hpb=f03c69858ae94c14939af2fa0280dc049d6b714a;p=m6w6%2Flibmemcached

diff --git a/bootstrap.sh b/bootstrap.sh
index 6a93c970..606d63d6 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -654,7 +654,7 @@ function make_for_snapshot ()
   assert_no_directory 'autom4te.cache'
 
   run_configure
-  make_target 'dist'
+  make_target 'all'
   make_target 'distclean'
 
   # We should have a configure, but no Makefile at the end of this exercise
@@ -857,6 +857,13 @@ function make_universe ()
   make_install_system
 }
 
+function check_snapshot ()
+{
+  if [ -n "$BOOTSTRAP_SNAPSHOT_CHECK" ]; then
+    assert_file "$BOOTSTRAP_SNAPSHOT_CHECK" 'snapshot check failed'
+  fi
+}
+
 function make_for_continuus_integration ()
 {
   # Setup the environment if we are local
@@ -872,9 +879,7 @@ function make_for_continuus_integration ()
       assert_file 'configure'
     fi
 
-    if [ -n "$BOOTSTRAP_SNAPSHOT_CHECK" ]; then
-      assert_file "$BOOTSTRAP_SNAPSHOT_CHECK" 'snapshot check failed'
-    fi
+    check_snapshot
   else
     # If we didn't require a snapshot, then we should not have a configure
     assert_no_file 'configure'
@@ -1611,6 +1616,7 @@ function bootstrap ()
       'snapshot')
         make_for_snapshot
         snapshot_run=true
+        check_snapshot
         ;;
       'rpm')
         make_rpm
@@ -1708,10 +1714,10 @@ function main ()
   # We don't want Jenkins overriding other variables, so we NULL them.
   if [ -z "$MAKE_TARGET" ]; then
     if $jenkins_build_environment; then
-      if [[ -n "$label" ]]; then
-        check_make_target $label
+      if [[ -n "$LABEL" ]]; then
+        check_make_target $LABEL
         if [ $? -eq 0 ]; then
-          MAKE_TARGET="$label"
+          MAKE_TARGET="$LABEL"
         fi
       fi