From: Brian Aker <brian@tangent.org>
Date: Fri, 19 Oct 2012 07:32:14 +0000 (-0400)
Subject: Update to allow rpm to be legal jenkins target.
X-Git-Tag: 1.0.14~22^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=1c8549a839b9f874d1a45e9b3161373db25d2626;p=m6w6%2Flibmemcached

Update to allow rpm to be legal jenkins target.
---

diff --git a/bootstrap.sh b/bootstrap.sh
index 1d114b28..40b28299 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -604,7 +604,7 @@ make_gdb ()
 
 # $1 target to compile
 # $2 to die, or not to die, based on contents
-function make_target ()
+make_target ()
 {
   if [[ -z "$1" ]]; then
     die "Programmer error, no target provided for make"
@@ -637,6 +637,7 @@ make_distcheck ()
 
 make_rpm ()
 {
+  run_configure_if_required
   make_target 'rpm'
 }
 
@@ -693,7 +694,7 @@ function run ()
     echo "\`$@' $ARGS"
   fi
 
-  $@ $ARGS
+  eval $@ $ARGS
 } 
 
 parse_command_line_options ()
@@ -769,10 +770,14 @@ autoreconf_setup ()
   if [[ -z "$MAKE" ]]; then 
     if command_exists gmake; then
       MAKE=`type -p gmake`
+    else
+      if command_exists make; then
+        MAKE=`type -p make`
+      fi
     fi
-
-    if command_exists make; then
-      MAKE=`type -p make`
+    
+    if $DEBUG; then
+      MAKE="$MAKE --warn-undefined-variables"
     fi
   fi
 
@@ -954,6 +959,8 @@ check_make_target()
       ;;
     'configure')
       ;;
+    'rpm')
+      ;;
     'snapshot')
       ;;
     'valgrind')
@@ -1036,6 +1043,9 @@ bootstrap ()
       'snapshot')
         make_for_snapshot
         ;;
+      'rpm')
+        make_rpm
+        ;;
       'valgrind')
         make_valgrind
         ;;